Fix compile failures on latest version of MinGW.

src/app-utils/guile-util.c

@@ -20,6 +20,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>

src/backend/dbi/Makefile.am

@@ -15,6 +15,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src/libqof/qof \
+  -I${top_srcdir}/src \
   ${GLIB_CFLAGS} \
   ${WARN_CFLAGS}
 

src/backend/dbi/gnc-backend-dbi.c

@@ -28,6 +28,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>

src/backend/xml/gnc-backend-xml.c

@@ -30,6 +30,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>

src/backend/xml/io-example-account.c

@@ -24,6 +24,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <sys/types.h>
 #include <ctype.h>
 #ifdef HAVE_DIRENT_H

src/backend/xml/io-gncxml-v2.c

@@ -21,6 +21,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <fcntl.h>

src/core-utils/binreloc.c

@@ -14,6 +14,11 @@
 #define __BINRELOC_C__
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #ifdef ENABLE_BINRELOC
 #include <sys/types.h>
 #include <sys/stat.h>

src/core-utils/gnc-filepath-utils.c

@@ -28,6 +28,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>

src/core-utils/gnc-gkeyfile-utils.c

@@ -36,6 +36,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>

src/engine/Query.c

@@ -23,6 +23,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <ctype.h>
 #include <glib.h>
 #include <math.h>

src/engine/Split.c

@@ -26,6 +26,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>

src/engine/Transaction.c

@@ -26,6 +26,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>

src/gnome/assistant-hierarchy.c

@@ -24,6 +24,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>

src/html/gnc-html-webkit.c

@@ -24,7 +24,11 @@
  ********************************************************************/
 
 #include "config.h"
-#include "platform.h"
+
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>

src/html/gnc-html.c

@@ -27,6 +27,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>

src/import-export/aqb/assistant-ab-initial.c

@@ -31,6 +31,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <aqbanking/banking.h>
 #include <glib.h>
 #include <glib/gi18n.h>

src/import-export/aqb/gnc-file-aqb-import.c

@@ -32,6 +32,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <fcntl.h>

src/import-export/csv-imp/gnc-csv-model.c

@@ -1,5 +1,9 @@
 #include "gnc-csv-model.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
 
 #include <glib/gi18n.h>
 

src/import-export/qif-imp/assistant-qif-import.c

@@ -25,6 +25,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>

src/libqof/qof/guid.cpp

@@ -29,6 +29,11 @@ extern "C"
 # include <config.h>
 #endif
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif

src/libqof/qof/qoflog.cpp

@@ -32,6 +32,11 @@ extern "C"
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <glib.h>
 #include <glib/gstdio.h>
 #ifdef HAVE_UNISTD_H
@@ -44,6 +49,7 @@ extern "C"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "qof.log"
@@ -167,7 +173,7 @@ qof_log_init_filename(const gchar* log_filename)
 
         if ((fd = g_mkstemp(fname)) != -1)
         {
-#ifdef _MSC_VER
+#if PLATFORM(WINDOWS)
             /* MSVC compiler: Somehow the OS thinks file descriptor from above
              * still isn't open. So we open normally with the file name and that's it. */
             fout = fopen(fname, "wb");

src/libqof/qof/qofsession.cpp

@@ -33,6 +33,11 @@
 
 #include "config.h"
 
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#include <windows.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>