X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=dbf9dd9ef82c4a1662c2ba2dceefa49e7b95cf25;hb=3ade95bab16abe09642554e9cbf56f117f01e507;hp=3ca10dac05b35b1ba1ad9aed57e61b2aa90f7122;hpb=55e1a4c1af5cb469357bb69543d89ad2dee48cc1;p=uffi.git diff --git a/src/libraries.lisp b/src/libraries.lisp index 3ca10da..dbf9dd9 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) @@ -87,8 +84,11 @@ library type if type is not specified." (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 mswindows) (truename filename) + #-(and lispworks win32 mswindows) filename)))) + (if (and (not force-load) (find filename *loaded-libraries* :test #'string-equal)) t ;; return T, but don't reload library