diff options
| author | leyla <leyla@leyla.com> | 2011-03-14 11:28:13 -0700 |
|---|---|---|
| committer | leyla <leyla@leyla.com> | 2011-03-14 11:28:13 -0700 |
| commit | c762beed267115b7670e01219ccff4fc64bdca4c (patch) | |
| tree | 8ee42a8defd3bae58759a9dd3517385d830c52b8 /indra/llvfs/lldir_win32.h | |
| parent | bc2aca863f5d27f551e48a2de8f879360a3a96ab (diff) | |
| parent | 405a748746c8ea040fe0efeda54e58f378289795 (diff) | |
Merge
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; }; |