diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-01 11:53:47 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-01 11:53:47 -0800 |
| commit | 4e3068fcd465d47354997ebc2503913e7a7b95aa (patch) | |
| tree | a287b224ff79d8160ca884836ce1a140ef50f08f /indra/llvfs/lldir_linux.h | |
| parent | f86e1125568ee24eb6879b7669555aa4d29a4e64 (diff) | |
| parent | 1d0001020716d3f3d3734dd4a4f8cd609bc2b215 (diff) | |
STORM-1024 : pull into viewer-development
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 |