r10830: Automated commit for Debian build of uffi upstream-version-1.5.6

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 942f764b4ca53bc8a79ceccf8ee1e990f4d9c8a9..275aee1bb799e6984d050c77e0f4a42b16636d32 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -9,11 +9,8 @@
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
 ;;;;
-;;;; UFFI users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (in-package #:uffi)
@@ -79,13 +76,19 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
                                           force-load)
-  #+(or allegro mcl) (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
-       (setq filename (namestring filename)))  ; already loaded
+  #+(or allegro mcl sbcl) (declare (ignore module supporting-libraries))
+  #+(or cmu scl) (declare (ignore module))
+  #+lispworks (declare (ignore supporting-libraries))
 
+  (when (and filename (or (null (pathname-directory filename))
+                          (probe-file filename)))
+    (if (pathnamep filename)    ;; ensure filename is a string to check if already loaded
+       (setq filename (namestring (if (null (pathname-directory filename))
+                                      filename 
+                                      ;; lispworks treats as UNC, so use truename
+                                      #+(and lispworks win32) (truename filename)
+                                      #-(and lispworks win32) filename))))
+    
     (if (and (not force-load)
             (find filename *loaded-libraries* :test #'string-equal))
        t ;; return T, but don't reload library
@@ -111,7 +114,8 @@ library type if type is not specified."
                (funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename)
                (error c))))
 
-       #+lispworks (fli:register-module module :real-name filename)
+       #+lispworks (fli:register-module module :real-name filename
+                                                :connection-style :immediate)
        #+allegro (load filename)
        #+openmcl (ccl:open-shared-library filename)
        #+(and mcl (not openmcl)) (ccl:add-to-shared-library-search-path filename t)