[mcclim-cvs] CVS update: mcclim/Lisp-Dep/mp-openmcl.lisp

[Timothy Moore]

Update of /project/mcclim/cvsroot/mcclim/Lisp-Dep
In directory common-lisp.net:/tmp/cvs-serv25618/Lisp-Dep

Modified Files:
	mp-openmcl.lisp 
Log Message:

In condition-wait, pass through return value of OpenMCL function.

Date: Fri Jul  1 14:59:40 2005
Author: tmoore

Index: mcclim/Lisp-Dep/mp-openmcl.lisp
diff -u mcclim/Lisp-Dep/mp-openmcl.lisp:1.4 mcclim/Lisp-Dep/mp-openmcl.lisp:1.5
--- mcclim/Lisp-Dep/mp-openmcl.lisp:1.4	Mon Feb 23 11:48:28 2004
+++ mcclim/Lisp-Dep/mp-openmcl.lisp	Fri Jul  1 14:59:40 2005
@@ -142,17 +142,15 @@
   (let ((lock-error nil))
     (unwind-protect
 	 (progn
-	   (handler-bind ((ccl::lock-not-owner #'(lambda (c)
-						   (declare (ignore c))
-						   (setq lock-error t))))
+	   (handler-bind
+	       ((ccl::lock-not-owner #'(lambda (c)
+					 (declare (ignore c))
+					 (setq lock-error t))))
 	     (ccl:release-lock lock))
-	   ;; OS error return value?
 	   (if timeout
-	       (progn
-		 (ccl:timed-wait-on-semaphore cv timeout)
-		 t)
-	       (ccl:wait-on-semaphore cv)))
-      (unless lock-error
+	       (ccl:timed-wait-on-semaphore cv timeout)
+	       (ccl:wait-on-semaphore cv))) ;XXX nil here is some kind of error
+      (unless lock-error       ; We didn't have the lock.
 	(ccl:grab-lock lock)))))
 
 (defun condition-notify (cv)