diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-10 12:11:22 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-10 12:11:22 -0800 |
| commit | 378585e7f089b62b7a0dd69adde48cd63fc7bacc (patch) | |
| tree | c9f231718b68483a791beb1fb82c90820cd8dc5c /indra/llvfs/lldir_solaris.h | |
| parent | bb57d34cb1db372322f196ba3fd9190a352a71e3 (diff) | |
| parent | e94fa316f34c275d3059808903ea5d8cf24a1ad3 (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 |