gnucash master: Fix compile failures on latest version of MinGW.
John Ralls
jralls at code.gnucash.org
Fri May 22 23:59:44 EDT 2015
Updated via https://github.com/Gnucash/gnucash/commit/82329272 (commit)
from https://github.com/Gnucash/gnucash/commit/847e2c27 (commit)
commit 82329272048863c21ff286b5e79516896fab6db3
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 22 19:50:25 2015 -0700
Fix compile failures on latest version of MinGW.
diff --git a/src/app-utils/guile-util.c b/src/app-utils/guile-util.c
index 91e8170..48d9ea4 100644
--- a/src/app-utils/guile-util.c
+++ b/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>
diff --git a/src/backend/dbi/Makefile.am b/src/backend/dbi/Makefile.am
index 2a95ef4..193df03 100644
--- a/src/backend/dbi/Makefile.am
+++ b/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}
diff --git a/src/backend/dbi/gnc-backend-dbi.c b/src/backend/dbi/gnc-backend-dbi.c
index 56736d7..03f6463 100644
--- a/src/backend/dbi/gnc-backend-dbi.c
+++ b/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>
diff --git a/src/backend/xml/gnc-backend-xml.c b/src/backend/xml/gnc-backend-xml.c
index 9d532c7..0aacf4f 100644
--- a/src/backend/xml/gnc-backend-xml.c
+++ b/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>
diff --git a/src/backend/xml/io-example-account.c b/src/backend/xml/io-example-account.c
index 207ed71..21369b5 100644
--- a/src/backend/xml/io-example-account.c
+++ b/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
diff --git a/src/backend/xml/io-gncxml-v2.c b/src/backend/xml/io-gncxml-v2.c
index c091178..dbaafaf 100644
--- a/src/backend/xml/io-gncxml-v2.c
+++ b/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>
diff --git a/src/core-utils/binreloc.c b/src/core-utils/binreloc.c
index 54904ce..6a2a55f 100644
--- a/src/core-utils/binreloc.c
+++ b/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>
diff --git a/src/core-utils/gnc-filepath-utils.c b/src/core-utils/gnc-filepath-utils.c
index 11d5ecf..6b86c8c 100644
--- a/src/core-utils/gnc-filepath-utils.c
+++ b/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>
diff --git a/src/core-utils/gnc-gkeyfile-utils.c b/src/core-utils/gnc-gkeyfile-utils.c
index 7491df8..df84309 100644
--- a/src/core-utils/gnc-gkeyfile-utils.c
+++ b/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>
diff --git a/src/engine/Query.c b/src/engine/Query.c
index 644cb74..d475fdb 100644
--- a/src/engine/Query.c
+++ b/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>
diff --git a/src/engine/Split.c b/src/engine/Split.c
index d6d36f4..05905bb 100644
--- a/src/engine/Split.c
+++ b/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>
diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c
index fb195c1..f695ce8 100644
--- a/src/engine/Transaction.c
+++ b/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>
diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c
index 23b98f8..d45941d 100644
--- a/src/gnome/assistant-hierarchy.c
+++ b/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>
diff --git a/src/html/gnc-html-webkit.c b/src/html/gnc-html-webkit.c
index 98e80ec..371cb2c 100644
--- a/src/html/gnc-html-webkit.c
+++ b/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>
diff --git a/src/html/gnc-html.c b/src/html/gnc-html.c
index d3fa6bd..19dc128 100644
--- a/src/html/gnc-html.c
+++ b/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>
diff --git a/src/import-export/aqb/assistant-ab-initial.c b/src/import-export/aqb/assistant-ab-initial.c
index d01b590..99ee7cc 100644
--- a/src/import-export/aqb/assistant-ab-initial.c
+++ b/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>
diff --git a/src/import-export/aqb/gnc-file-aqb-import.c b/src/import-export/aqb/gnc-file-aqb-import.c
index 21188eb..7b02749 100644
--- a/src/import-export/aqb/gnc-file-aqb-import.c
+++ b/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>
diff --git a/src/import-export/csv-imp/gnc-csv-model.c b/src/import-export/csv-imp/gnc-csv-model.c
index 877529a..dea8213 100644
--- a/src/import-export/csv-imp/gnc-csv-model.c
+++ b/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>
diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c
index 83b62bb..a20c903 100644
--- a/src/import-export/qif-imp/assistant-qif-import.c
+++ b/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>
diff --git a/src/libqof/qof/guid.cpp b/src/libqof/qof/guid.cpp
index d434543..6993f8d 100644
--- a/src/libqof/qof/guid.cpp
+++ b/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
diff --git a/src/libqof/qof/qoflog.cpp b/src/libqof/qof/qoflog.cpp
index 73dec72..faf9781 100644
--- a/src/libqof/qof/qoflog.cpp
+++ b/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");
diff --git a/src/libqof/qof/qofsession.cpp b/src/libqof/qof/qofsession.cpp
index b51c3ca..609c58d 100644
--- a/src/libqof/qof/qofsession.cpp
+++ b/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>
Summary of changes:
src/app-utils/guile-util.c | 5 +++++
src/backend/dbi/Makefile.am | 1 +
src/backend/dbi/gnc-backend-dbi.c | 5 +++++
src/backend/xml/gnc-backend-xml.c | 5 +++++
src/backend/xml/io-example-account.c | 5 +++++
src/backend/xml/io-gncxml-v2.c | 5 +++++
src/core-utils/binreloc.c | 5 +++++
src/core-utils/gnc-filepath-utils.c | 5 +++++
src/core-utils/gnc-gkeyfile-utils.c | 5 +++++
src/engine/Query.c | 5 +++++
src/engine/Split.c | 5 +++++
src/engine/Transaction.c | 5 +++++
src/gnome/assistant-hierarchy.c | 5 +++++
src/html/gnc-html-webkit.c | 6 +++++-
src/html/gnc-html.c | 5 +++++
src/import-export/aqb/assistant-ab-initial.c | 5 +++++
src/import-export/aqb/gnc-file-aqb-import.c | 5 +++++
src/import-export/csv-imp/gnc-csv-model.c | 4 ++++
src/import-export/qif-imp/assistant-qif-import.c | 5 +++++
src/libqof/qof/guid.cpp | 5 +++++
src/libqof/qof/qoflog.cpp | 8 +++++++-
src/libqof/qof/qofsession.cpp | 5 +++++
22 files changed, 107 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list