Apply patch #2156, fixes for Windows - MinGW gcc 4.4.0 compiler

mhugent · mhugent · commit 2aeb92081cd0 · 2009-12-03T14:55:48.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12325 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -46,14 +46,12 @@
 #ifdef MSVC
 #undef _fmode
 int _fmode = _O_BINARY;
-#endif
-#ifndef _MSC_VER
+#else
 // Only do this if we are not building on windows with msvc.
 // Recommended method for doing this with msvc is with a call to _set_fmode
 // which is the first thing we do in main().
-#undef _fmode
-int _fmode = _O_BINARY;
-#endif//_MSC_VER
+// Similarly, with MinGW set _fmode in main().
+#endif	//_MSC_VER
 #else
 #include <getopt.h>
 #endif
@@ -238,9 +236,13 @@ void myMessageOutput( QtMsgType type, const char *msg )
 
 int main( int argc, char *argv[] )
 {
+#ifdef WIN32	// Windows
 #ifdef _MSC_VER
   _set_fmode( _O_BINARY );
-#endif
+#else	//MinGW
+  _fmode = _O_BINARY;
+#endif	// _MSC_VER
+#endif	// WIN32
 
 #ifndef _MSC_VER
   // Set up the custom qWarning/qDebug custom handler
diff --git a/src/core/pal/pal.h b/src/core/pal/pal.h
@@ -37,10 +37,7 @@
 
 #include <list>
 #include <iostream>
-
-#ifdef _MSC_VER
-#include <time.h>
-#endif
+#include <ctime>
 
 // TODO ${MAJOR} ${MINOR} etc instead of 0.2
 
diff --git a/src/core/qgssearchstringparser.yy b/src/core/qgssearchstringparser.yy
@@ -20,6 +20,7 @@
 %{
 #include <qglobal.h>
 #include <QList>
+#include <cstdlib>
 #include "qgssearchtreenode.h"
 
 // don't redeclare malloc/free
