X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=942f764b4ca53bc8a79ceccf8ee1e990f4d9c8a9;hb=212e27b1cad10c503a9231fe6b7819e6945505c7;hp=592f08ca1f0d0db7f4ec9b69763595e74aa5955d;hpb=c3c2c51723711ab8f9ad8be19f52312b7b65f81f;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 592f08c..942f764 100644
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.lisp,v 1.13 2003/08/27 20:02:59 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -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)