[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv4538

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:
* swank-sbcl.lisp (receive-if): Add #+/-linux to avoid yet more
WITH-TIMEOUT related problems.

--- /project/slime/cvsroot/slime/ChangeLog	2008/08/30 15:33:49	1.1487
+++ /project/slime/cvsroot/slime/ChangeLog	2008/08/30 15:33:56	1.1488
@@ -1,5 +1,8 @@
 2008-08-30  Helmut Eller  <heller at common-lisp.net>
 
+	* swank-sbcl.lisp (receive-if): Add #+/-linux to avoid yet more
+	WITH-TIMEOUT related problems.
+
 	* swank-gray.lisp (slime-input-stream): Remove the output stream
 	slot.  Most of the time we can just call force-output.
 
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2008/08/22 14:28:41	1.216
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2008/08/30 15:33:56	1.217
@@ -1326,10 +1326,15 @@
              (setf (mailbox.queue mbox) (nconc (ldiff q tail) (cdr tail)))
              (return (car tail))))
          (when (eq timeout t) (return (values nil t)))
+         ;; FIXME: with-timeout doesn't work properly on Darwin
+         #+linux
          (handler-case (sb-ext:with-timeout 0.2
                          (sb-thread:condition-wait (mailbox.waitqueue mbox)
                                                    mutex))
-           (sb-ext:timeout ()))))))
+           (sb-ext:timeout ()))
+         #-linux  
+         (sb-thread:condition-wait (mailbox.waitqueue mbox)
+                                   mutex)))))
   )
 
 (defimplementation quit-lisp ()