Skip to content

Commit

Permalink
1.0.48.19: another go at fixing the win32 build
Browse files Browse the repository at this point in the history
 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.
  • Loading branch information
nikodemus committed May 15, 2011
1 parent 5385e8a commit 152c97d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
7 changes: 6 additions & 1 deletion src/code/fd-stream.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/code/unix.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions tools-for-build/grovel-headers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion version.lisp-expr
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 152c97d

Please sign in to comment.