From 82329272048863c21ff286b5e79516896fab6db3 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Fri, 22 May 2015 19:50:25 -0700 Subject: [PATCH] Fix compile failures on latest version of MinGW. --- 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(-) diff --git a/src/app-utils/guile-util.c b/src/app-utils/guile-util.c index 91e8170b00..48d9ea4b8b 100644 --- a/src/app-utils/guile-util.c +++ b/src/app-utils/guile-util.c @@ -20,6 +20,11 @@ #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/backend/dbi/Makefile.am b/src/backend/dbi/Makefile.am index 2a95ef45dc..193df03af4 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 56736d7849..03f6463ca1 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/backend/xml/gnc-backend-xml.c b/src/backend/xml/gnc-backend-xml.c index 9d532c7d97..0aacf4f7d1 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/backend/xml/io-example-account.c b/src/backend/xml/io-example-account.c index 207ed71178..21369b5ecd 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #ifdef HAVE_DIRENT_H diff --git a/src/backend/xml/io-gncxml-v2.c b/src/backend/xml/io-gncxml-v2.c index c09117841c..dbaafaf03c 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/core-utils/binreloc.c b/src/core-utils/binreloc.c index 54904cec59..6a2a55f598 100644 --- a/src/core-utils/binreloc.c +++ b/src/core-utils/binreloc.c @@ -14,6 +14,11 @@ #define __BINRELOC_C__ #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #ifdef ENABLE_BINRELOC #include #include diff --git a/src/core-utils/gnc-filepath-utils.c b/src/core-utils/gnc-filepath-utils.c index 11d5ecfdeb..6b86c8cbc6 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/core-utils/gnc-gkeyfile-utils.c b/src/core-utils/gnc-gkeyfile-utils.c index 7491df8e2e..df843094db 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/engine/Query.c b/src/engine/Query.c index 644cb7454c..d475fdb876 100644 --- a/src/engine/Query.c +++ b/src/engine/Query.c @@ -23,6 +23,11 @@ #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/engine/Split.c b/src/engine/Split.c index d6d36f46b2..05905bb77c 100644 --- a/src/engine/Split.c +++ b/src/engine/Split.c @@ -26,6 +26,11 @@ #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c index fb195c18ff..f695ce886f 100644 --- a/src/engine/Transaction.c +++ b/src/engine/Transaction.c @@ -26,6 +26,11 @@ #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c index 23b98f8745..d45941da06 100644 --- a/src/gnome/assistant-hierarchy.c +++ b/src/gnome/assistant-hierarchy.c @@ -24,6 +24,11 @@ #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/html/gnc-html-webkit.c b/src/html/gnc-html-webkit.c index 98e80ecaba..371cb2c18c 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 +#if PLATFORM(WINDOWS) +#include +#endif #include #include diff --git a/src/html/gnc-html.c b/src/html/gnc-html.c index d3fa6bd4c3..19dc1281f6 100644 --- a/src/html/gnc-html.c +++ b/src/html/gnc-html.c @@ -27,6 +27,11 @@ #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/import-export/aqb/assistant-ab-initial.c b/src/import-export/aqb/assistant-ab-initial.c index d01b590d72..99ee7ccde4 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/import-export/aqb/gnc-file-aqb-import.c b/src/import-export/aqb/gnc-file-aqb-import.c index 21188ebcf1..7b027499df 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/import-export/csv-imp/gnc-csv-model.c b/src/import-export/csv-imp/gnc-csv-model.c index 877529aec4..dea8213e16 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 +#if PLATFORM(WINDOWS) +#include +#endif #include diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c index 83b62bb4f0..a20c903b12 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 +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include diff --git a/src/libqof/qof/guid.cpp b/src/libqof/qof/guid.cpp index d434543286..6993f8dd36 100644 --- a/src/libqof/qof/guid.cpp +++ b/src/libqof/qof/guid.cpp @@ -29,6 +29,11 @@ extern "C" # include #endif +#include +#if PLATFORM(WINDOWS) +#include +#endif + #ifdef HAVE_SYS_TYPES_H # include #endif diff --git a/src/libqof/qof/qoflog.cpp b/src/libqof/qof/qoflog.cpp index 73dec72ce3..faf9781595 100644 --- a/src/libqof/qof/qoflog.cpp +++ b/src/libqof/qof/qoflog.cpp @@ -32,6 +32,11 @@ extern "C" #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #ifdef HAVE_UNISTD_H @@ -44,6 +49,7 @@ extern "C" #include #include #include +#include #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 b51c3ca636..609c58d780 100644 --- a/src/libqof/qof/qofsession.cpp +++ b/src/libqof/qof/qofsession.cpp @@ -33,6 +33,11 @@ #include "config.h" +#include +#if PLATFORM(WINDOWS) +#include +#endif + #include #include #include