diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-08 01:36:15 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-08 01:36:15 +0000 |
| commit | 127c45dfbab4550ebd7074f131e3a7b844affea8 (patch) | |
| tree | 4e53a71899f03bd8de1028231f025c7355df7f11 /indra/llvfs/lldir_win32.h | |
| parent | cb7ae391efed1cadab621734c6eb53fd62df19a4 (diff) | |
| parent | a07e6c625108988ad664df70a1842b53c843f223 (diff) | |
Merge with 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; }; |