From 282dca7ef87c03cf88e3a44353f5355923c2a4d3 Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Sun, 25 Mar 2007 23:44:53 +0200 Subject: [PATCH] Fixes by Francois-Rene Rideau. Signed-off-by: Stelian Ionescu --- io-multiplex/common.lisp | 8 ++++---- sockets/gray-stream-methods.lisp | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/io-multiplex/common.lisp b/io-multiplex/common.lisp index b17f01d..125ef81 100644 --- a/io-multiplex/common.lisp +++ b/io-multiplex/common.lisp @@ -513,14 +513,14 @@ ;;;; ;; FIXME: Until a way to autodetect platform features is implemented -(iolib-utils:define-constant et:pollrdhup 0) +(iolib-utils:define-constant et::pollrdhup 0) (defun wait-until-fd-ready (fd event-type &optional timeout) (flet ((choose-poll-flags (type) (ecase type - (:read (logior et:pollin et:pollrdhup et:pollpri)) + (:read (logior et:pollin et::pollrdhup et:pollpri)) (:write (logior et:pollout et:pollhup)) - (:read-write (logior et:pollin et:pollrdhup et:pollpri + (:read-write (logior et:pollin et::pollrdhup et:pollpri et:pollout et:pollhup))))) (let ((status ())) (with-foreign-object (pollfd 'et:pollfd) @@ -534,7 +534,7 @@ (return-from wait-until-fd-ready '(:error)))) (flags-case et:revents ((et:pollout et:pollhup) (push :write status)) - ((et:pollin et:pollrdhup et:pollpri) (push :read status)) + ((et:pollin et::pollrdhup et:pollpri) (push :read status)) ((et:pollerr et:pollnval) (push :error status))) (return-from wait-until-fd-ready status)))))) diff --git a/sockets/gray-stream-methods.lisp b/sockets/gray-stream-methods.lisp index 6532d7c..ad0a5ec 100644 --- a/sockets/gray-stream-methods.lisp +++ b/sockets/gray-stream-methods.lisp @@ -175,6 +175,7 @@ (char str 0))))) (defun maybe-find-line-ending-no-hang (fd ib ef) + (declare (ignore fd)) (let* ((start-off (iobuf-start ib)) (char-code (bref ib start-off))) (block nil @@ -267,6 +268,7 @@ (type iobuf buffer) (type buffer-index start) (type buffer-index end) + (ignore fd) (optimize (speed 3) (space 0) (safety 0) (debug 0))) (unless max-char-num (setf max-char-num -1)) (let ((ptr start) oldptr -- 2.11.4.GIT