Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1:/tmp/cvs-serv11383/src/code
Modified Files:
unix.lisp
Log Message:
0.8.2.20:
Fix to WITH-TIMEOUT (Stig Sandoe sbcl-devel 2003-07-30)
... more than one form now permissible in body.
... don't change the interface (yet); I can't think of a
backward-compatible way.
Index: unix.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/unix.lisp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- unix.lisp 29 Jul 2003 13:01:55 -0000 1.40
+++ unix.lisp 7 Aug 2003 10:38:32 -0000 1.41
@@ -759,7 +759,7 @@
(slot (slot itvo 'it-value) 'tv-usec))
which (alien-sap (addr itvn))(alien-sap (addr itvo))))))
-(defmacro sb!ext::with-timeout (expires &body body)
+(defmacro sb!ext:with-timeout (expires &body body)
"Execute the body, interrupting it with a SIGALRM after at least
EXPIRES seconds have passed. Uses Unix setitimer(), restoring any
previous timer after the body has finished executing"
@@ -779,8 +779,8 @@
(unix-setitimer :real 0 0 ,s ,u)
,@body)
(unix-setitimer :real 0 0 ,saved-seconds ,saved-useconds))
- ,@body)))))
-
+ (progn
+ ,@body))))))
(defconstant ENOENT 2) ; Unix error code, "No such file or directory"
|