diff options
| author | developer@Developer-PC <developer@Developer-PC> | 2012-09-21 22:21:42 -0700 |
|---|---|---|
| committer | developer@Developer-PC <developer@Developer-PC> | 2012-09-21 22:21:42 -0700 |
| commit | ecf72da021d16168688a833e776e8a76e80ee4d6 (patch) | |
| tree | c61de5560a008cba335d41e567fb48fade638361 /indra/llcommon | |
| parent | 2d36f9b98a95a384f712c711bf9fc4cbe53780aa (diff) | |
More windows build fixes
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llfile.cpp | 6 | ||||
| -rw-r--r-- | indra/llcommon/llfile.h | 2 |
2 files changed, 4 insertions, 4 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) : diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h index 7049ab1396..9d70db96ea 100644 --- a/indra/llcommon/llfile.h +++ b/indra/llcommon/llfile.h @@ -38,7 +38,6 @@ typedef FILE LLFILE; #include <fstream> -#include <bits/postypes.h> #include <sys/stat.h> #if LL_WINDOWS @@ -47,6 +46,7 @@ typedef struct _stat llstat; #else typedef struct stat llstat; #include <ext/stdio_filebuf.h> +#include <bits/postypes.h> #endif #ifndef S_ISREG |