X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi-loader.lisp;h=47a1f6ad2f86e4f35b0dc9f57df8c3e51e9dc677;hb=d3d9487458df1c55d472676a07622470eaaf98a2;hp=084f66ae160fded631dbe9e4e33d623844c3d511;hpb=78489032c6f66ce666ffe5e2e726503b61b94616;p=clsql.git

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index 084f66a..47a1f6a 100644
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -35,17 +35,18 @@ well as any of the filenames in any of the clsql:*foreign-library-search-paths*"
 	   (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)))
-			  (try-load pn))))
+				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*)))))
 
+;; 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