From ecf72da021d16168688a833e776e8a76e80ee4d6 Mon Sep 17 00:00:00 2001
From: "developer@Developer-PC" <developer@Developer-PC>
Date: Fri, 21 Sep 2012 22:21:42 -0700
Subject: More windows build fixes
---
indra/llcommon/llfile.cpp | 6 +++---
indra/llcommon/llfile.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'indra/llcommon')
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
--
cgit v1.2.3