diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-11 14:33:24 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-11 14:33:24 -0800 |
| commit | 3011e697c34ac6ad1ce95b435c487f8da20fb5e2 (patch) | |
| tree | 57fef4c1a3430c07cf1cb682c1a1784282cad7d3 /indra/llvfs/lldir_solaris.h | |
| parent | e342c522b4bb5efd8eb9687efddfe47199e02395 (diff) | |
| parent | d0b457365145233c3b4bc64991b183722b13fac8 (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 |