Version 1.8.3: patch from Stelian Ionescu

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 426c01942f079831160d470b5ebf047cb41ae288..578f3d6c29d3ba941fb58e9337c54443fb735717 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -7,9 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
@@ -76,12 +74,11 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
                                            force-load)
-  #+(or allegro openmcl digitool sbcl) (declare (ignore module supporting-libraries))
-  #+(or cmu scl) (declare (ignore module))
-  #+lispworks (declare (ignore supporting-libraries))
+  (declare (ignorable module supporting-libraries))
 
   (flet ((load-failure ()
            (error "Unable to load foreign library \"~A\"." filename)))
+    (declare (ignorable #'load-failure))
     (when (and filename (or (null (pathname-directory filename))
                             (probe-file filename)))
       (if (pathnamep filename)    ;; ensure filename is a string to check if already loaded
@@ -106,11 +103,10 @@ library type if type is not specified."
                                   (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)))
+        (alien:load-foreign filename
+                            :libraries
+                            (convert-supporting-libraries-to-string
+                             supporting-libraries))
         #+sbcl
         (handler-case (sb-alien::load-1-foreign filename)
           (sb-int:unsupported-operator (c)