X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=275aee1bb799e6984d050c77e0f4a42b16636d32;hb=c4533c02d3f2ebd53178c93de2dee09ca39fe0e7;hp=3ca10dac05b35b1ba1ad9aed57e61b2aa90f7122;hpb=55e1a4c1af5cb469357bb69543d89ad2dee48cc1;p=uffi.git diff --git a/src/libraries.lisp b/src/libraries.lisp index 3ca10da..275aee1 100644 --- 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,16 +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)) + #+(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 (truename 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