projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.40.6: call an appropriate existing ctor from MAKE-INSTANCE (CLASS)
[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
58458b0
..
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
@@
-57,6
+56,7
@@
#endif
#include "wrap.h"
#endif
#include "wrap.h"
+#include "gc.h"
#define DEFTYPE(lispname,cname) { cname foo; \
printf("(define-alien-type " lispname " (%s %d))\n", (((foo=-1)<0) ? "sb!alien:signed" : "unsigned"), (8 * (sizeof foo))); }
#define DEFTYPE(lispname,cname) { cname foo; \
printf("(define-alien-type " lispname " (%s %d))\n", (((foo=-1)<0) ? "sb!alien:signed" : "unsigned"), (8 * (sizeof foo))); }
@@
-437,10
+437,11
@@
main(int argc, char *argv[])
defconstant("fpe-fltsub", -1);
#endif
#endif // !WIN32
defconstant("fpe-fltsub", -1);
#endif
#endif // !WIN32
+ printf("\n");
#ifdef LISP_FEATURE_BSD
printf(";;; sysctl(3) names\n");
#ifdef LISP_FEATURE_BSD
printf(";;; sysctl(3) names\n");
- printf("(in-package \"SB!IMPL\")\n\n");
+ printf("(in-package \"SB!IMPL\")\n");
defconstant("ctl-kern", CTL_KERN);
defconstant("ctl-hw", CTL_HW);
defconstant("ctl-maxname", CTL_MAXNAME);
defconstant("ctl-kern", CTL_KERN);
defconstant("ctl-hw", CTL_HW);
defconstant("ctl-maxname", CTL_MAXNAME);
@@
-450,5
+451,14
@@
main(int argc, char *argv[])
defconstant("hw-pagesize", HW_PAGESIZE);
printf("\n");
#endif
defconstant("hw-pagesize", HW_PAGESIZE);
printf("\n");
#endif
+
+#ifdef LISP_FEATURE_GENCGC
+ printf(";;; GENCGC related\n");
+ printf("(in-package \"SB!KERNEL\")\n");
+ DEFTYPE("page-index-t", page_index_t);
+ DEFTYPE("generation-index-t", generation_index_t);
+ printf("\n");
+#endif
+
return 0;
}
return 0;
}