diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-05 07:23:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-05 07:23:43 -0400 |
| commit | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (patch) | |
| tree | 327ccb1a74e828db62e8d19768ff953192d86f72 /indra/llvfs/lldir_linux.h | |
| parent | fa4359e571fb67aca651efc3403274cdf0bb2616 (diff) | |
| parent | 2787be7d3558c3ca1ed15863e875612b1b27ec78 (diff) | |
merge changes for STORM-1051
Diffstat (limited to 'indra/llvfs/lldir_linux.h')
| -rw-r--r-- | indra/llvfs/lldir_linux.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h index 451e81ae93..a34de1241d 100644 --- a/indra/llvfs/lldir_linux.h +++ b/indra/llvfs/lldir_linux.h @@ -1,6 +1,6 @@ /** * @file lldir_linux.h - * @brief Definition of directory utilities class for linux + * @brief Definition of directory utilities class for linux * * $LicenseInfo:firstyear=2000&license=viewerlgpl$ * Second Life Viewer Source Code @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_LINUX +#error This header must not be included when compiling for any target other than Linux. Consider including lldir.h instead. +#endif // !LL_LINUX + #ifndef LL_LLDIR_LINUX_H #define LL_LLDIR_LINUX_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); @@ -53,7 +57,7 @@ private: DIR *mDirp; int mCurrentDirIndex; int mCurrentDirCount; - std::string mCurrentDir; + std::string mCurrentDir; }; #endif // LL_LLDIR_LINUX_H |