diff options
| author | callum <none@none> | 2011-03-09 15:34:43 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-03-09 15:34:43 -0800 |
| commit | aac70bccada903098bd5a5074d7c4e347ddbef03 (patch) | |
| tree | 66d7626379646f2eb385566e5d5098e95ebb3cd2 /indra/llvfs/lldir_mac.h | |
| parent | 90c824d10dbf4468dfdd9ffebf7456f81964391a (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
Merge with tip of http://hg.secondlife.com/viewer-development (rev 14798)
Diffstat (limited to 'indra/llvfs/lldir_mac.h')
| -rw-r--r-- | indra/llvfs/lldir_mac.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index 4eac3c3ae6..b456d3afca 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_DARWIN +#error This header must not be included when compiling for any target other than Mac OS. Consider including lldir.h instead. +#endif // !LL_DARWIN + #ifndef LL_LLDIR_MAC_H #define LL_LLDIR_MAC_H @@ -39,7 +43,7 @@ public: /*virtual*/ void initAppDirs(const std::string &app_name, const std::string& app_read_only_data_dir); -public: + virtual S32 deleteFilesInDir(const std::string &dirname, const std::string &mask); virtual std::string getCurPath(); virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); |