From: Russ Tyndall <russ@acceleration.net>
Date: Tue, 7 Jan 2014 16:39:08 +0000 (-0500)
Subject: Merge branch 'master' of github.com:vityok/clsql into fix-atol64
X-Git-Tag: v6.5.0~16
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=5bb8544ca8a58d10b57f751bad2c9abf4d7a13c8;hp=eabede9da3e61ef5191b601dcf9b30f30f613f3e

Merge branch 'master' of github.com:vityok/clsql into fix-atol64
---

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index d549ccb..04b9f24 100644
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -37,9 +37,9 @@ well as any of the filenames in any of the clsql:*foreign-library-search-paths*"
                           (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)"
+       (error "Couldn't load foreign librar~@P ~{~S~^, ~}. (searched ~S: ~S)"
               (length filenames) filenames
-              'clsql:*foreign-library-search-paths*)))))
+              'clsql:*foreign-library-search-paths* 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*