X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tools-for-build%2Fgrovel-headers.c;h=9746e124a2d8d94bf3c521e3de977b647549bf55;hb=e0aff99a73d836da0dad4602e5559595fbe5ba5c;hp=56069ae06f6a36b169b3147ae50b659c82a7c438;hpb=f251802ba07257a9b3a23eca02cfd89ad9d6e6b9;p=sbcl.git

diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index 56069ae..9746e12 100644
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -18,25 +18,28 @@
  * 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 <poll.h>
+  #include <sys/select.h>
   #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>
@@ -45,9 +48,17 @@
 #include <signal.h>
 #include <errno.h>
 
-#include "genesis/config.h"
+#ifdef LISP_FEATURE_HPUX
+#include <sys/bsdtty.h> /* for TIOCGPGRP */
+#endif
+
+#ifdef LISP_FEATURE_BSD
+  #include <sys/param.h>
+  #include <sys/sysctl.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))); }
@@ -209,6 +220,7 @@ main(int argc, char *argv[])
     defconstant("enoent", ENOENT);
     defconstant("eexist", EEXIST);
     defconstant("eintr", EINTR);
+    defconstant("eagain", EAGAIN);
 
     defconstant("s-ifmt",  S_IFMT);
     defconstant("s-ifdir", S_IFDIR);
@@ -227,6 +239,9 @@ main(int argc, char *argv[])
     DEFTYPE("wst-nlink-t", wst_nlink_t);
     DEFTYPE("wst-uid-t", wst_uid_t);
     DEFTYPE("wst-gid-t", wst_gid_t);
+
+    /* KLUDGE */
+    defconstant("fd-setsize", 1024);
     printf("\n");
 #else
     printf("(in-package \"SB!ALIEN\")\n\n");
@@ -239,6 +254,16 @@ main(int argc, char *argv[])
 
     printf("(in-package \"SB!UNIX\")\n\n");
 
+    printf(";;; select()\n");
+    defconstant("fd-setsize", FD_SETSIZE);
+
+    printf(";;; poll()\n");
+    defconstant("pollin", POLLIN);
+    defconstant("pollout", POLLOUT);
+    defconstant("pollpri", POLLPRI);
+    defconstant("pollhup", POLLHUP);
+    DEFTYPE("nfds-t", nfds_t);
+
     printf(";;; langinfo\n");
     defconstant("codeset", CODESET);
 
@@ -308,6 +333,7 @@ main(int argc, char *argv[])
     deferrno("ebadf", EBADF);
     deferrno("enoent", ENOENT);
     deferrno("eintr", EINTR);
+    deferrno("eagain", EAGAIN);
     deferrno("eio", EIO);
     deferrno("eexist", EEXIST);
     deferrno("eloop", ELOOP);
@@ -321,11 +347,10 @@ main(int argc, char *argv[])
     printf("\n");
 
     printf(";;; various ioctl(2) flags\n");
-    defconstant("tiocnotty",  TIOCNOTTY);
-    defconstant("tiocgwinsz", TIOCGWINSZ);
-    defconstant("tiocswinsz", TIOCSWINSZ);
     defconstant("tiocgpgrp",  TIOCGPGRP);
     defconstant("tiocspgrp",  TIOCSPGRP);
+    defconstant("tiocgwinsz", TIOCGWINSZ);
+    defconstant("tiocswinsz", TIOCSWINSZ);
     /* KLUDGE: These are referenced by old CMUCL-derived code, but
      * Linux doesn't define them.
      *
@@ -397,7 +422,7 @@ main(int argc, char *argv[])
     defsignal("sigwaiting", SIGWAITING);
 #endif
     defsignal("sigwinch", SIGWINCH);
-#ifndef SIGXCPU
+#ifdef SIGXCPU
     defsignal("sigxcpu", SIGXCPU);
 #endif
 #ifdef SIGXFSZ
@@ -426,7 +451,32 @@ main(int argc, char *argv[])
 #else
     defconstant("fpe-fltsub", -1);
 #endif
-
 #endif // !WIN32
+    printf("\n");
+
+#ifdef LISP_FEATURE_BSD
+    printf(";;; sysctl(3) names\n");
+    printf("(in-package \"SB!IMPL\")\n");
+    defconstant("ctl-kern", CTL_KERN);
+    defconstant("ctl-hw", CTL_HW);
+    defconstant("ctl-maxname", CTL_MAXNAME);
+    defconstant("kern-ostype", KERN_OSTYPE);
+    defconstant("kern-osrelease", KERN_OSRELEASE);
+    defconstant("hw-model", HW_MODEL);
+    defconstant("hw-pagesize", HW_PAGESIZE);
+    printf("\n");
+#endif
+
+    printf("(in-package \"SB!KERNEL\")\n\n");
+#ifdef LISP_FEATURE_GENCGC
+    printf(";;; GENCGC related\n");
+    DEFTYPE("page-index-t", page_index_t);
+    DEFTYPE("generation-index-t", generation_index_t);
+    printf("\n");
+#endif
+
+    printf(";;; Our runtime types\n");
+    DEFTYPE("os-vm-size-t", os_vm_size_t);
+
     return 0;
 }