[Sbcl-commits] CVS: sbcl/src/runtime win32-os.c,1.22,1.23

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7838/src/runtime

Modified Files:
	win32-os.c 
Log Message:
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.



Index: win32-os.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/win32-os.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- win32-os.c	2 Nov 2006 17:18:37 -0000	1.22
+++ win32-os.c	23 Nov 2006 12:42:31 -0000	1.23
@@ -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>