From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Sun, 15 May 2011 08:20:08 +0000 (+0000)
Subject: 1.0.48.19: another go at fixing the win32 build
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=152c97de336af584a9b133207a772c704e3245cf;p=sbcl.git

1.0.48.19: another go at fixing the win32 build

 Roll back the last attempt, that was not only incomplete, but
 somewhat ill adviced.

 Instead, put in :UNKNOWN as FD-STREAM-FD-TYPE if we need to serve
 events, and :REGULAR otherwise.
---

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 07dfaf1..a759017 100644
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -2217,7 +2217,12 @@
         ((not (or input output))
          (error "File descriptor must be opened either for input or output.")))
   (let ((stream (%make-fd-stream :fd fd
-                                 :fd-type (sb!unix:fd-type fd)
+                                 :fd-type (progn
+                                            #!-win32 (sb!unix:fd-type fd)
+                                            ;; KLUDGE.
+                                            #!+win32 (if serve-events
+                                                         :unknown
+                                                         :regular))
                                  :name name
                                  :file file
                                  :original original
diff --git a/src/code/unix.lisp b/src/code/unix.lisp
index 115277a..32f7716 100644
--- a/src/code/unix.lisp
+++ b/src/code/unix.lisp
@@ -881,6 +881,7 @@ corresponds to NAME, or NIL if there is none."
              (%extract-stat-results (addr buf))
              fd (addr buf))))
 
+#!-win32
 (defun fd-type (fd)
   (declare (type unix-fd fd))
   (let ((fmt (logand
diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index e7a1b70..1b61f98 100644
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -223,10 +223,7 @@ main(int argc, char *argv[])
     defconstant("eagain", EAGAIN);
 
     defconstant("s-ifmt",  S_IFMT);
-    defconstant("s-ififo", S_IFIFO);
-    defconstant("s-ifchr", S_IFCHR);
     defconstant("s-ifdir", S_IFDIR);
-    defconstant("s-ifblk", S_IFBLK);
     defconstant("s-ifreg", S_IFREG);
 
     DEFTYPE("ino-t",  ino_t);
diff --git a/version.lisp-expr b/version.lisp-expr
index 7ff7051..ca0cebe 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -20,4 +20,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.48.18"
+"1.0.48.19"