From b9cb2a22d5c9369fa00fd014deca46400e441b89 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Thu, 15 Jun 2017 15:56:38 -0700
Subject: [PATCH] Disable Guile's GnuLib broken redefinition of 'close'.

To a GnuLib function that isn't built or installed.
---
 src/app-utils/guile-util.c            | 7 +++++++
 src/gnome-utils/gnc-main-window.c     | 1 +
 src/html/gnc-html-webkit.c            | 3 +++
 src/report/report-system/gnc-report.c | 4 +++-
 4 files changed, 14 insertions(+), 1 deletion(-)

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 <platform.h>
 #if PLATFORM(WINDOWS)
+#include <winsock.h>
 #include <windows.h>
 #endif
 
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#ifdef __MINGW32__
+#define _GL_UNISTD_H //Deflect poisonous define of close in Guile's GnuLib
+#endif
 #include <libguile.h>
 #include <errno.h>
 #ifdef HAVE_UNISTD_H
+# ifdef close
+#  undef close
+# endif
 # include <unistd.h>
 #else
 # include <io.h>
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 <gtkmacintegration/gtkosxapplication.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
+# define __need_system_sys_stat_h //To block Guile-2.0's evil substitute
 # include <sys/types.h>
 # include <sys/stat.h> // 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 <platform.h>
+#ifdef __MINGW32__
+#define _GL_UNISTD_H //Deflect poisonous define of close in Guile's GnuLib
+#endif
 #include <libguile.h>
 #if PLATFORM(WINDOWS)
 #include <windows.h>
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 <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>