r10917: 2006-04-17 Kevin Rosenberg (kevin@rosenberg.net)

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index af860c4c5947cdb2d2fe551d93b5654dcfe8d372..a8d09c3f2dc7781e4b772eed46369e31f0ef7805 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,8 +76,8 @@ 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 openmcl digitool 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))
@@ -89,8 +86,8 @@ library type if type is not specified."
        (setq filename (namestring (if (null (pathname-directory filename))
                                       filename 
                                       ;; lispworks treats as UNC, so use truename
-                                      #+(and lispworks win32 mswindows) (truename filename)
-                                      #-(and lispworks win32 mswindows) filename))))
+                                      #+(and lispworks win32) (truename filename)
+                                      #-(and lispworks win32) filename))))
     
     (if (and (not force-load)
             (find filename *loaded-libraries* :test #'string-equal))
@@ -121,7 +118,7 @@ library type if type is not specified."
                                                 :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)
+       #+digitool (ccl:add-to-shared-library-search-path filename t)
        
        (push filename *loaded-libraries*)
        t))))