projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.42: will be tagged as sbcl_1_0_42
[sbcl.git]
/
tools-for-build
/
grovel-headers.c
diff --git
a/tools-for-build/grovel-headers.c
b/tools-for-build/grovel-headers.c
index
b8c34b6
..
e93b2e1
100644
(file)
--- a/
tools-for-build/grovel-headers.c
+++ b/
tools-for-build/grovel-headers.c
@@
-18,25
+18,26
@@
* more information.
*/
* more information.
*/
+#include "genesis/config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#ifdef _WIN32
#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>
#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>
#else
#include <sys/times.h>
#include <sys/wait.h>
#include <sys/ioctl.h>
#include <sys/termios.h>
- #ifdef __APPLE_CC__
- #include "../src/runtime/darwin-dlshim.h"
- #include "../src/runtime/darwin-langinfo.h"
- #else
- #include <dlfcn.h>
- #include <langinfo.h>
- #endif
+ #include <langinfo.h>
+ #include <dlfcn.h>
#endif
#include <sys/stat.h>
#endif
#include <sys/stat.h>
@@
-45,8
+46,6
@@
#include <signal.h>
#include <errno.h>
#include <signal.h>
#include <errno.h>
-#include "genesis/config.h"
-
#ifdef LISP_FEATURE_HPUX
#include <sys/bsdtty.h> /* for TIOCGPGRP */
#endif
#ifdef LISP_FEATURE_HPUX
#include <sys/bsdtty.h> /* for TIOCGPGRP */
#endif