r9767: Automated commit for Debian build of uffi upstream-version-1.4.23

diff --git a/debian/changelog b/debian/changelog
index 4491b296fe4f0986a86ab65a6cd2d2474cca4937..c80c1a579e824d7902c94246ef004b525eac61be 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.4.23-1) unstable; urgency=low
+
+  * Add support for new SBCL load-shared-object [supplied by Andreas Fuchs]
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 13 Jul 2004 09:19:32 -0600
+
 cl-uffi (1.4.22-1) unstable; urgency=low
 
   * OpenMCL fix

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 8fa6612477f727c40ee4afb924d682ff0892a74f..942f764b4ca53bc8a79ceccf8ee1e990f4d9c8a9 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -105,15 +105,12 @@ library type if type is not specified."
                              (convert-supporting-libraries-to-string
                               supporting-libraries)))
        #+sbcl
-       (let ((type (pathname-type (parse-namestring filename))))
-         (if (or (string-equal type "so")
-                 (string-equal type "bundle")
-                 (string-equal type "dylib"))
-             (sb-alien::load-1-foreign filename)
-             (sb-alien:load-foreign filename 
-                                    :libraries
-                                    (convert-supporting-libraries-to-string
-                                     supporting-libraries))))
+       (handler-case (sb-alien::load-1-foreign filename)
+         (sb-int:unsupported-operator (c)
+           (if (fboundp (intern "LOAD-SHARED-OBJECT" :sb-alien))
+               (funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename)
+               (error c))))
+
        #+lispworks (fli:register-module module :real-name filename)
        #+allegro (load filename)
        #+openmcl (ccl:open-shared-library filename)