Remove CVS $Id$ keyword

[clsql.git] / uffi / clsql-uffi-loader.lisp

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index 084f66ae160fded631dbe9e4e33d623844c3d511..7d1ebec151f5da36569101544957b07dd7300e47 100644 (file)
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -7,9 +7,7 @@
 ;;;; Author:   Kevin M. Rosenberg
 ;;;; Created:  Mar 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -24,28 +22,29 @@ well as any of the filenames in any of the clsql:*foreign-library-search-paths*"
   (setq filenames (if (listp filenames) filenames (list filenames)))
 
   (flet ((try-load (testpath)
-          (handler-case
-              (uffi:load-foreign-library testpath
-                                         :module module
-                                         :supporting-libraries supporting-libraries)
-            (error (c) (warn "~A" c) nil))))
+           (handler-case
+               (uffi:load-foreign-library testpath
+                                          :module module
+                                          :supporting-libraries supporting-libraries)
+             (error nil)))) ;(c) (warn "~A" c) nil))))
     (or
      (loop for type in (uffi:foreign-library-types)
-          thereis
-          (loop for name in filenames
-                for pn = (make-pathname :name name :type type)
-                thereis (or
-                         (loop for search-path in clsql:*foreign-library-search-paths*
-                               thereis (try-load (merge-pathnames pn search-path)))
-                         (try-load pn))))
+           thereis
+           (loop for name in filenames
+                 for pn = (make-pathname :name name :type type)
+                 thereis (or
+                          (try-load pn)
+                          (loop for search-path in clsql:*foreign-library-search-paths*
+                                thereis (try-load (merge-pathnames pn search-path))))))
      (when errorp
        (error "Couldn't load foreign librar~@P ~{~S~^, ~}. (searched ~S)"
-             (length filenames) filenames
-             'clsql:*foreign-library-search-paths*)))))
+              (length filenames) filenames
+              'clsql:*foreign-library-search-paths*)))))
 
+;; searches clsql_uffi64 to accomodate both 32-bit and 64-bit libraries on same system
 (defvar *clsql-uffi-library-filenames*
-  (list #+(or 64bit x86-64) "clsql_uffi64"
-       "clsql_uffi"))
+  `(,@(when (> most-positive-fixnum (expt 2 32)) (list "clsql_uffi64"))
+    "clsql_uffi"))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to