r5209: Auto commit for Debian build
[uffi.git] / src / libraries.lisp
index 1344d9d31a39113c7f08b5d6532ca86b0d93c85a..65f9f5707fac06d697c194aa0829de6db9d59d01 100644 (file)
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.lisp,v 1.7 2003/06/06 21:59:18 kevin Exp $
+;;;; $Id: libraries.lisp,v 1.8 2003/06/26 18:02:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -85,12 +85,12 @@ library type if type is not specified."
       (progn
        #+cmu
        (let ((type (pathname-type (parse-namestring filename))))
-         (if (equal type "so")
+         (if (string-equal type "so")
              (sys::load-object-file filename)
-           (alien:load-foreign filename 
-                               :libraries
-                               (convert-supporting-libraries-to-string
-                                supporting-libraries))))
+             (alien:load-foreign filename 
+                                 :libraries
+                                 (convert-supporting-libraries-to-string
+                                  supporting-libraries))))
        #+scl
        (let ((type (pathname-type (parse-namestring filename))))
          (alien:load-foreign filename 
@@ -98,10 +98,12 @@ library type if type is not specified."
                              (convert-supporting-libraries-to-string
                               supporting-libraries)))
        #+sbcl
-       (sb-alien:load-foreign filename 
-                              :libraries
-                                (convert-supporting-libraries-to-string
-                                 supporting-libraries))
+       (if (string-equal type "so")
+           (sb-alien::load-1-foreign filename)
+           (sb-alien:load-foreign filename 
+                                  :libraries
+                                  (convert-supporting-libraries-to-string
+                                   supporting-libraries)))
        #+lispworks (fli:register-module module :real-name filename)
        #+allegro (load filename)
        #+openmcl (ccl:open-shared-library filename)