r3060: *** empty log message ***

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 72dbc09c8e8a94e0c0b05d072df5f72eb505a62d..c259dc8d08b69ba206e0c71bd0d25ded426c71a8 100644 (file)
--- 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.1 2002/09/30 10:02:36 kevin Exp $
+;;;; $Id: libraries.lisp,v 1.4 2002/10/16 11:56:43 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -73,10 +73,8 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
                                           force-load)
-  #+allegro (declare (ignore module supporting-libraries))
-  #+lispworks  (declare (ignore supporting-libraries))
-  #+cmu (declare (ignore module))
-  #+openmcl (declare (ignore module supporting-libraries))
+  #+(or allegro lispworks openmcl) (declare (ignore module supporting-libraries))
+  #+(or cmu scl sbcl) (declare (ignore module))
   
   (when (and filename (probe-file filename))
     (if (pathnamep filename)    ;; ensure filename is a string to check if
@@ -86,22 +84,32 @@ library type if type is not specified."
             (find filename *loaded-libraries* :test #'string-equal))
        t ;; return T, but don't reload library
       (progn
-       (when
-           #+cmu
-         (let ((type (pathname-type (parse-namestring filename))))
-           (if (equal type "so")
-               (sys::load-object-file filename)
-             (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)
-         #+(and mcl (not openmcl)) (ccl:add-to-shared-library-search-path filename t)
-              
-         (push filename *loaded-libraries*)
-         t)))))
+       #+cmu
+       (let ((type (pathname-type (parse-namestring filename))))
+         (if (equal type "so")
+             (sys::load-object-file filename)
+           (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)))
+       #+sbcl
+       (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)
+       #+(and mcl (not openmcl)) (ccl:add-to-shared-library-search-path filename t)
+       
+       (push filename *loaded-libraries*)
+       t))))
 
 (defun convert-supporting-libraries-to-string (libs)
   (let (lib-load-list)