diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2012-09-24 17:19:16 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2012-09-24 17:19:16 +0000 |
| commit | 33099f4b7b55c166ba77a3e862573cd68ec4acef (patch) | |
| tree | 07626f4aa5af7a99c7c34123e25687f09715ef00 /indra/llcommon/llfile.cpp | |
| parent | 93769c43e209b206ed06c1a812900e5e51473a74 (diff) | |
| parent | d3924200b6b8817461c0f10f87a643005466d4af (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llfile.cpp')
| -rw-r--r-- | indra/llcommon/llfile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index deab7a87fc..bc615ed39e 100644 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -329,7 +329,7 @@ const char *LLFile::tmpdir() #if LL_WINDOWS LLFILE * LLFile::_Fiopen(const std::string& filename, - std::ios::openmode mode,int) // protection currently unused + std::ios::openmode mode) { // open a file static const char *mods[] = { // fopen mode strings corresponding to valid[i] @@ -899,7 +899,7 @@ llifstream::llifstream(_Filet *_File, } #endif -#if LL_WINDOWS +#if !LL_WINDOWS // explicit llifstream::llifstream(int __fd, ios_base::openmode _Mode, size_t _Size) : @@ -1014,7 +1014,7 @@ llofstream::llofstream(_Filet *_File, } #endif -#if LL_WINDOWS +#if !LL_WINDOWS // explicit llofstream::llofstream(int __fd, ios_base::openmode _Mode, size_t _Size) : |