open intervals and type derivation

[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 2058cad..9746e12 100644 (file)
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -32,18 +32,14 @@
   #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 LISP_FEATURE_DARWIN
-    #include "../src/runtime/darwin-langinfo.h"
-  #endif
-  #ifdef LISP_FEATURE_DLSHIM
-    #include "../src/runtime/darwin-dlshim.h"
-  #else
-    #include <dlfcn.h>
-  #endif
+  #include <langinfo.h>
+  #include <dlfcn.h>
 #endif
 
 #include <sys/stat.h>
@@ -243,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");
@@ -255,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);
 
@@ -458,13 +467,16 @@ main(int argc, char *argv[])
     printf("\n");
 #endif
 
+    printf("(in-package \"SB!KERNEL\")\n\n");
 #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
 
+    printf(";;; Our runtime types\n");
+    DEFTYPE("os-vm-size-t", os_vm_size_t);
+
     return 0;
 }