X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tools-for-build%2Fgrovel-headers.c;h=421f03c9432e5311ccbed52505ce1c187fa7fa65;hb=2ac45434d6065ae2d042a1e989e22ba8770e8481;hp=b8c34b6bf6fe4e559ed679e192a0f05fba5b7d16;hpb=4ec0d70e08ea4b512d45ddbd6c82e8f6a91a914f;p=sbcl.git

diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index b8c34b6..421f03c 100644
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -18,24 +18,29 @@
  * more information.
  */
 
+#include "genesis/config.h"
+
 #include <stdio.h>
 #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>
   #include <sys/ioctl.h>
   #include <sys/termios.h>
-  #ifdef __APPLE_CC__
+  #include <langinfo.h>
+  #ifdef LISP_FEATURE_DLSHIM
     #include "../src/runtime/darwin-dlshim.h"
-    #include "../src/runtime/darwin-langinfo.h"
   #else
     #include <dlfcn.h>
-    #include <langinfo.h>
   #endif
 #endif
 
@@ -45,8 +50,6 @@
 #include <signal.h>
 #include <errno.h>
 
-#include "genesis/config.h"
-
 #ifdef LISP_FEATURE_HPUX
 #include <sys/bsdtty.h> /* for TIOCGPGRP */
 #endif