X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.cl;h=ac04d9365a16a5a57ac9ec296e3fe055f7b0de6c;hb=01a6946b2543ade1bfd5672ca92827da7e56bf85;hp=fa7f88b47c4457691bc7087ef462dca2a2862a47;hpb=bf5c7e7c36474375604bcbcedea8794a68dd1784;p=uffi.git

diff --git a/src/libraries.cl b/src/libraries.cl
index fa7f88b..ac04d93 100644
--- a/src/libraries.cl
+++ b/src/libraries.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.cl,v 1.3 2002/03/14 21:03:12 kevin Exp $
+;;;; $Id: libraries.cl,v 1.5 2002/03/21 04:05:15 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,13 +22,18 @@
 (defvar *loaded-libraries* nil
   "List of foreign libraries loaded. Used to prevent reloading a library")
 
-(defun load-foreign-library (filename &key module supporting-libraries)
+(defun load-foreign-library (filename &key module supporting-libraries
+					   force-load)
   #+allegro (declare (ignore module supporting-libraries))
   #+lispworks  (declare (ignore supporting-libraries))
   #+cmu (declare (ignore module))
   
   (when (and filename (probe-file filename))
-    (if (find filename *loaded-libraries* :test #'string-equal)
+    (if (pathnamep filename)    ;; ensure filename is a string to check if
+	(setq filename (namestring filename)))  ; already loaded
+
+    (if (and (not force-load)
+	     (find filename *loaded-libraries* :test #'string-equal))
 	t ;; return T, but don't reload library
       (progn
 	#+cmu (alien:load-foreign filename 
@@ -40,7 +45,8 @@
 					 :real-name filename)
 	#+allegro (load filename)
 	
-	(push filename *loaded-libraries*))))
+	(push filename *loaded-libraries*)
+	t)))
   )
 
 (defun convert-supporting-libraries-to-string (libs)