diff options
author | Tofu Buzzard <no-email> | 2011-03-09 10:56:03 -0800 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-03-09 10:56:03 -0800 |
commit | 63636e8ceabc7487e42427d9a6a83cad5116daa0 (patch) | |
tree | e912dda63824af14ea7a53c4e31b9ec22a514b44 /indra/llvfs/lldir_solaris.h | |
parent | 47f8b357eaa2af76e675c2235a071962f4203b5f (diff) | |
parent | 75e938cd75d82fcea7d58c556abf403b3629283e (diff) |
merge
Diffstat (limited to 'indra/llvfs/lldir_solaris.h')
-rw-r--r-- | indra/llvfs/lldir_solaris.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h index 4a1794f539..70fac6f818 100644 --- a/indra/llvfs/lldir_solaris.h +++ b/indra/llvfs/lldir_solaris.h @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_SOLARIS +#error This header must not be included when compiling for any target other than Solaris. Consider including lldir.h instead. +#endif // !LL_SOLARIS + #ifndef LL_LLDIR_SOLARIS_H #define LL_LLDIR_SOLARIS_H @@ -40,7 +44,7 @@ public: /*virtual*/ void initAppDirs(const std::string &app_name, const std::string& app_read_only_data_dir); -public: + virtual std::string getCurPath(); virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); @@ -50,7 +54,7 @@ private: DIR *mDirp; int mCurrentDirIndex; int mCurrentDirCount; - std::string mCurrentDir; + std::string mCurrentDir; }; #endif // LL_LLDIR_SOLARIS_H |