diff --git a/src/app-utils/guile-util.c b/src/app-utils/guile-util.c index 24c7b7fdcd..043f5c7161 100644 --- a/src/app-utils/guile-util.c +++ b/src/app-utils/guile-util.c @@ -23,15 +23,22 @@ #include "swig-runtime.h" #include #if PLATFORM(WINDOWS) +#include #include #endif #include #include #include +#ifdef __MINGW32__ +#define _GL_UNISTD_H //Deflect poisonous define of close in Guile's GnuLib +#endif #include #include #ifdef HAVE_UNISTD_H +# ifdef close +# undef close +# endif # include #else # include diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index c60add56bc..274f52ebb7 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -76,6 +76,7 @@ #include #endif #ifdef HAVE_SYS_STAT_H +# define __need_system_sys_stat_h //To block Guile-2.0's evil substitute # include # include // for stat(2) #endif diff --git a/src/html/gnc-html-webkit.c b/src/html/gnc-html-webkit.c index 31b7a93520..aae4ddede9 100644 --- a/src/html/gnc-html-webkit.c +++ b/src/html/gnc-html-webkit.c @@ -26,6 +26,9 @@ #include "config.h" #include +#ifdef __MINGW32__ +#define _GL_UNISTD_H //Deflect poisonous define of close in Guile's GnuLib +#endif #include #if PLATFORM(WINDOWS) #include diff --git a/src/report/report-system/gnc-report.c b/src/report/report-system/gnc-report.c index 40c50908a6..b491140388 100644 --- a/src/report/report-system/gnc-report.c +++ b/src/report/report-system/gnc-report.c @@ -23,7 +23,9 @@ ********************************************************************/ #include "config.h" - +#ifdef __MINGW32__ +#define _GL_UNISTD_H //Deflect poisonous define in Guile's GnuLib +#endif #include #include #include