summaryrefslogtreecommitdiff
path: root/indra/llvfs/lldir_win32.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-04 13:13:59 -0800
committerMerov Linden <merov@lindenlab.com>2011-03-04 13:13:59 -0800
commitf7842eab6199d6d7ff2130e9395ced3e8f33f94d (patch)
tree56a0eaacafa56f73be608e932423a9074f1bb6af /indra/llvfs/lldir_win32.h
parentbeda7ae971acb05e8e1dce83e8f86ae51da54ba3 (diff)
parent5048942dbc0a0aa577625bc47d77162cbcf1afdc (diff)
pull from oz_linden/viewer-autobuild
Diffstat (limited to 'indra/llvfs/lldir_win32.h')
-rw-r--r--indra/llvfs/lldir_win32.h8
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;
};