1.0.3.21: suseconds_t -> long on win32

 * suseconds_t doesn't exist on win32, so use long instead

diff --git a/src/code/unix.lisp b/src/code/unix.lisp
index cd9a6fc..be0e228 100644 (file)
--- a/src/code/unix.lisp
+++ b/src/code/unix.lisp
@@ -187,10 +187,17 @@ SYSCALL-FORM. Repeat evaluation of SYSCALL-FORM if it is interrupted."
 ;; microsecond but also has a range of years.
 ;; CLH: Note that tv-usec used to be a time-t, but that this seems
 ;; problematic on Darwin x86-64 (and wrong). Trying suseconds-t.
+#!-win32
+(define-alien-type nil
+    (struct timeval
+            (tv-sec time-t)             ; seconds
+            (tv-usec suseconds-t))) ; and microseconds
+
+#!+win32
 (define-alien-type nil
-  (struct timeval
-          (tv-sec time-t)               ; seconds
-          (tv-usec suseconds-t)))       ; and microseconds
+    (struct timeval
+            (tv-sec time-t)             ; seconds
+            (tv-usec long)))          ; and microseconds
 \f
 ;;;; resourcebits.h
 

diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index eb4aee3..40f4320 100644 (file)
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -213,7 +213,6 @@ main(int argc, char *argv[])
 
     DEFTYPE("ino-t",  ino_t);
     DEFTYPE("time-t", time_t);
-    DEFTYPE("suseconds-t", suseconds_t);
     DEFTYPE("off-t",  off_t);
     DEFTYPE("size-t", size_t);
     DEFTYPE("mode-t", mode_t);

diff --git a/version.lisp-expr b/version.lisp-expr
index d4d9a05..7fe02e0 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.3.20"
+"1.0.3.21"