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

[uffi.git] / src / libraries.lisp

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)