diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-09 14:33:11 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-09 14:33:11 -0800 |
commit | 543a63e51a99583c670deb8eb28adc9237ed90d3 (patch) | |
tree | 71af9cca512c52beb495948902e5e88c9980313b /indra/llvfs/lldir_win32.h | |
parent | bdd994d186369afdfd263d4c40689b165b75bee6 (diff) | |
parent | 58b393bb1eb2ef15597803741fded4942f3dc647 (diff) |
Merge latest
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; }; |