From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Thu, 23 Nov 2006 12:42:30 +0000 (+0000)
Subject: 0.9.18.70: fix Win32 build with version 3.8 WinAPI headers from MinGW
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=9b69673c900a480026c25f4ee5e98f3192e4b98a;p=sbcl.git

0.9.18.70: fix Win32 build with version 3.8 WinAPI headers from MinGW
  * Conflicting boolean types. Report and patch by Pierre Mai.
    Still in freeze, damn.
---

diff --git a/src/runtime/win32-os.c b/src/runtime/win32-os.c
index baac264..c5292c2 100644
--- a/src/runtime/win32-os.c
+++ b/src/runtime/win32-os.c
@@ -49,7 +49,17 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
+/* KLUDGE: Avoid double definition of boolean by rpcndr.h included via
+ * shlobj.h.
+ *
+ * FIXME: We should probably arrange to use the rpcndr.h boolean on Windows,
+ * or get rid of our own boolean type.
+ */
+#define boolean rpcndr_boolean
 #include <shlobj.h>
+#undef boolean
+
 #include <math.h>
 
 #include <excpt.h>
diff --git a/version.lisp-expr b/version.lisp-expr
index 29ba23d..7f834ad 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.18.69"
+"0.9.18.70"