[bknr-cvs] hans changed trunk/thirdparty/u

[BKNR Commits]

Revision: 3637
Author: hans
URL: http://bknr.net/trac/changeset/3637

FIxes for cmucl-20

U   trunk/thirdparty/uffi-1.6.0/src/libraries.lisp
U   trunk/thirdparty/usocket/backend/cmucl.lisp

Modified: trunk/thirdparty/uffi-1.6.0/src/libraries.lisp
===================================================================
--- trunk/thirdparty/uffi-1.6.0/src/libraries.lisp	2008-07-25 12:53:31 UTC (rev 3636)
+++ trunk/thirdparty/uffi-1.6.0/src/libraries.lisp	2008-07-25 12:53:57 UTC (rev 3637)
@@ -95,22 +95,11 @@
                (find filename *loaded-libraries* :test #'string-equal))
           t ;; return T, but don't reload library
       (progn
-	#+cmu
-	(let ((type (pathname-type (parse-namestring filename))))
-	  (if (string-equal type "so")
-	      (unless
-                  (sys::load-object-file filename)
-                (load-failure))
-	      (alien:load-foreign filename
-				  :libraries
-				  (convert-supporting-libraries-to-string
-				   supporting-libraries))))
-	#+scl
-	(let ((type (pathname-type (parse-namestring filename))))
-	  (alien:load-foreign filename
-			      :libraries
-			      (convert-supporting-libraries-to-string
-			       supporting-libraries)))
+	#+(or cmu scl)
+	(alien:load-foreign filename
+                              :libraries
+                              (convert-supporting-libraries-to-string
+                               supporting-libraries))
 	#+sbcl
 	(handler-case (sb-alien::load-1-foreign filename)
 	  (sb-int:unsupported-operator (c)

Modified: trunk/thirdparty/usocket/backend/cmucl.lisp
===================================================================
--- trunk/thirdparty/usocket/backend/cmucl.lisp	2008-07-25 12:53:31 UTC (rev 3636)
+++ trunk/thirdparty/usocket/backend/cmucl.lisp	2008-07-25 12:53:57 UTC (rev 3637)
@@ -166,6 +166,13 @@
   (unix:unix-gethostname))
 
 (defun wait-for-input-internal (sockets &key timeout)
+  #+MP
+  (progn
+    (unless (= 1 (length sockets))
+      (error "can't wait for multiple file descriptors with multiprocessing enabled"))
+    (mp:process-wait-until-fd-usable (socket (car sockets)) :input timeout)
+    sockets)
+  #-MP
   (with-mapped-conditions ()
     (alien:with-alien ((rfds (alien:struct unix:fd-set)))
        (unix:fd-zero rfds)