X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tools-for-build%2Fgrovel-headers.c;h=43ce773f6a3bbd6d2312ffa68b4622ae8c100ade;hb=8052518d2db212aad944bfcaf554301c5272b81e;hp=554ff33585b102dc78d5689b76c582c1217def44;hpb=a7409fa0a69f733ea2460a1aeddbe04b5c4c0888;p=sbcl.git

diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index 554ff33..43ce773 100644
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -19,11 +19,11 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #ifdef _WIN32
   #define WIN32_LEAN_AND_MEAN
   #include <windows.h>
-  #include <stdlib.h>
   #include <shlobj.h>
 #else
   #include <sys/times.h>
@@ -47,6 +47,8 @@
 
 #include "genesis/config.h"
 
+#include "wrap.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))); }
 
@@ -217,6 +219,14 @@ main(int argc, char *argv[])
     DEFTYPE("size-t", size_t);
     DEFTYPE("mode-t", mode_t);
 
+    DEFTYPE("wst-dev-t", wst_dev_t);
+    DEFTYPE("wst-off-t", wst_off_t);
+    DEFTYPE("wst-blksize-t", wst_blksize_t);
+    DEFTYPE("wst-blkcnt-t", wst_blkcnt_t);
+    DEFTYPE("wst-nlink-t", wst_nlink_t);
+    DEFTYPE("wst-uid-t", wst_uid_t);
+    DEFTYPE("wst-gid-t", wst_gid_t);
+    printf("\n");
 #else
     printf("(in-package \"SB!ALIEN\")\n\n");
 
@@ -241,15 +251,22 @@ main(int argc, char *argv[])
     DEFTYPE("off-t",   off_t);
     DEFTYPE("size-t",  size_t);
     DEFTYPE("time-t",  time_t);
-#if defined(LISP_FEATURE_DARWIN) && defined(LISP_FEATURE_PPC)
-    /* No idea if this is an issue with PPC versions of OS X, or just
-     * 10.3, but at any rate on some Darwin versions suseconds_t seems
-     * to be missing... Similar kludge in sb-posix. */
-    DEFTYPE("suseconds-t", int);
+#if !defined(LISP_FEATURE_OS_PROVIDES_SUSECONDS_T)
+    /* Similar kludge in sb-posix. */
+    DEFTYPE("suseconds-t", long);
 #else
     DEFTYPE("suseconds-t", suseconds_t);
 #endif
     DEFTYPE("uid-t",   uid_t);
+    printf(";; Types in src/runtime/wrap.h. See that file for explantion.\n");
+    printf(";; Don't use these types for anything other than the stat wrapper.\n");
+    DEFTYPE("wst-dev-t", wst_dev_t);
+    DEFTYPE("wst-off-t", wst_off_t);
+    DEFTYPE("wst-blksize-t", wst_blksize_t);
+    DEFTYPE("wst-blkcnt-t", wst_blkcnt_t);
+    DEFTYPE("wst-nlink-t", wst_nlink_t);
+    DEFTYPE("wst-uid-t", wst_uid_t);
+    DEFTYPE("wst-gid-t", wst_gid_t);
     printf("\n");
 
     printf(";;; fcntl.h (or unistd.h on OpenBSD and NetBSD)\n");
@@ -291,6 +308,7 @@ main(int argc, char *argv[])
     deferrno("eintr", EINTR);
     deferrno("eio", EIO);
     deferrno("eexist", EEXIST);
+    deferrno("eloop", ELOOP);
     deferrno("espipe", ESPIPE);
     deferrno("ewouldblock", EWOULDBLOCK);
     printf("\n");
@@ -336,8 +354,8 @@ main(int argc, char *argv[])
     printf("\n");
 
     printf(";;; signals\n");
-    defconstant("sig-dfl", SIG_DFL);
-    defconstant("sig-ign", SIG_IGN);
+    defconstant("sig-dfl", (unsigned long)SIG_DFL);
+    defconstant("sig-ign", (unsigned long)SIG_IGN);
 
     defsignal("sigalrm", SIGALRM);
     defsignal("sigbus", SIGBUS);
@@ -407,6 +425,6 @@ main(int argc, char *argv[])
     defconstant("fpe-fltsub", -1);
 #endif
 
-#endif // _WIN32
+#endif // !WIN32
     return 0;
 }