1.0.32.39: Win32 build fix

  * Because both sbcl and <rpcndr.h> define a boolean type,
grovel-headers was failing to build on win32.  Copied the kludge for
working around this issue from src/runtime/runtime.h to
tools-for-build/grovel-headers.c.

diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index b8c34b6..6c42bd1 100644 (file)
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -22,9 +22,13 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #ifdef _WIN32
+  /* KLUDGE: From src/runtime/runtime.h, avoid double definition of
+     boolean.  We really should clean up our act on this one. */
+  #define boolean rpcndr_boolean
   #define WIN32_LEAN_AND_MEAN
   #include <windows.h>
   #include <shlobj.h>
+  #undef boolean
 #else
   #include <sys/times.h>
   #include <sys/wait.h>

diff --git a/version.lisp-expr b/version.lisp-expr
index 5d28905..5dba829 100644 (file)
--- 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".)
-"1.0.32.38"
+"1.0.32.39"