diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-09 21:17:29 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-09 21:17:29 -0800 |
| commit | 18a66fb7618c80108d224c9b1c3ff14cc5f3a87f (patch) | |
| tree | 6ff3da645b7d076f4dee2538c6d596e681c90a90 /indra/llvfs/lldir_win32.h | |
| parent | 7f42c02cad9dbd068bc49bed4b6cd18fd8fff606 (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
Pull from viewer-development
Diffstat (limited to 'indra/llvfs/lldir_win32.h')
| -rw-r--r-- | indra/llvfs/lldir_win32.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 4c932c932c..b170ebbcd7 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_WINDOWS +#error This header must not be included when compiling for any target other than Windows. Consider including lldir.h instead. +#endif // !LL_WINDOWS + #ifndef LL_LLDIR_WIN32_H #define LL_LLDIR_WIN32_H @@ -47,8 +51,8 @@ public: /*virtual*/ std::string getLLPluginFilename(std::string base_name); private: - BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); - + BOOL getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); + void* mDirSearch_h; llutf16string mCurrentDir; }; |