X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=094433548d3d14532bd13dba8bdfcd9609c477d7;hb=77fd04d570b9ae1fd40c1f7b0134af826576210b;hp=56829a0155d6a287c6e21f6c769854070c12a138;hpb=2e9e6f820b5bf35bafb506d63e92866bfacac7e9;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 56829a0..0944335 100644
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          libraries.cl
+;;;; Name:          libraries.lisp
 ;;;; Purpose:       UFFI source to load foreign libraries
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.lisp,v 1.6 2002/11/20 21:01:31 kevin Exp $
+;;;; $Id: libraries.lisp,v 1.10 2003/08/14 19:35:05 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
 
 (defvar *loaded-libraries* nil
   "List of foreign libraries loaded. Used to prevent reloading a library")
@@ -73,7 +72,7 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
 					   force-load)
-  #+(or allegro lispworks mcl) (declare (ignore module supporting-libraries))
+  #+(or allegro mcl) (declare (ignore module supporting-libraries))
   #+(or cmu scl sbcl) (declare (ignore module))
   
   (when (and filename (probe-file filename))
@@ -86,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 
@@ -99,10 +98,13 @@ 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))
+	(let ((type (pathname-type (parse-namestring filename))))
+	  (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)