From: Russ Tyndall 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=-c Merge branch 'master' of github.com:vityok/clsql into fix-atol64 --- 5bb8544ca8a58d10b57f751bad2c9abf4d7a13c8 diff --combined uffi/clsql-uffi-loader.lisp index 6a286a9,d549ccb..04b9f24 --- a/uffi/clsql-uffi-loader.lisp +++ b/uffi/clsql-uffi-loader.lisp @@@ -37,9 -37,9 +37,9 @@@ well as any of the filenames in any of (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* @@@ -54,12 -54,12 +54,12 @@@ set to the right path before compiling (defvar *uffi-library-loaded* nil "T if foreign library was able to be loaded successfully") - (defun load-uffi-foreign-library () - (clsql:push-library-path clsql-uffi-system::*clsql-uffi-library-dir*) - (find-and-load-foreign-library *clsql-uffi-library-filenames* - :module "clsql-uffi" - :supporting-libraries - *clsql-uffi-supporting-libraries*) - (setq *uffi-library-loaded* t)) + ;; (defun load-uffi-foreign-library () + ;; (clsql:push-library-path clsql-uffi-system::*clsql-uffi-library-dir*) + ;; (find-and-load-foreign-library *clsql-uffi-library-filenames* + ;; :module "clsql-uffi" + ;; :supporting-libraries + ;; *clsql-uffi-supporting-libraries*) + ;; (setq *uffi-library-loaded* t)) - (load-uffi-foreign-library) + ;; (load-uffi-foreign-library)