Add minor upstream changes; conform new debian standards

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 886464e362663a65615115b62dcf21d4115cc643..426c01942f079831160d470b5ebf047cb41ae288 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -20,16 +20,16 @@
 
 (defun default-foreign-library-type ()
   "Returns string naming default library type for platform"
-  #+(or win32 cygwin mswindows) "dll"
+  #+(or win32 win64 cygwin mswindows windows) "dll"
   #+(or macosx darwin ccl-5.0) "dylib"
-  #-(or win32 cygwin mswindows macosx darwin ccl-5.0) "so"
+  #-(or win32 win64 cygwin mswindows windows macosx darwin ccl-5.0) "so"
 )
 
 (defun foreign-library-types ()
   "Returns list of string naming possible library types for platform, sorted by preference"
-  #+(or win32 mswindows) '("dll" "lib")
+  #+(or win32 win64 windows mswindows) '("dll" "lib")
   #+(or macosx darwin ccl-5.0) '("dylib" "bundle")
-  #-(or win32 mswindows macosx darwin ccl-5.0) '("so" "a" "o")
+  #-(or win32 win64 windows mswindows macosx darwin ccl-5.0) '("so" "a" "o")
 )
 
 (defun find-foreign-library (names directories &key types drive-letters)
@@ -44,10 +44,10 @@ library type if type is not specified."
     (setq names (list names)))
   (unless (listp directories)
     (setq directories (list directories)))
-  #+(or win32 mswindows)
+  #+(or win32 win64 windows mswindows)
   (unless (listp drive-letters)
     (setq drive-letters (list drive-letters)))
-  #-(or win32 mswindows)
+  #-(or win32 win64 windows mswindows)
   (setq drive-letters '(nil))
   (dolist (drive-letter drive-letters)
     (dolist (name names)
@@ -88,8 +88,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) (truename filename)
-                                         #-(and lispworks win32) filename))))
+                                         #+(and lispworks mswindows) (truename filename)
+                                         #-(and lispworks mswindows) filename))))
 
       (if (and (not force-load)
                (find filename *loaded-libraries* :test #'string-equal))