Merge branch 'master' of github.com:vityok/clsql into fix-atol64
authorRuss Tyndall <russ@acceleration.net>
Tue, 7 Jan 2014 16:39:08 +0000 (11:39 -0500)
committerRuss Tyndall <russ@acceleration.net>
Tue, 7 Jan 2014 16:39:08 +0000 (11:39 -0500)
1  2 
uffi/clsql-uffi-loader.lisp

index 6a286a945e342eba0288912d7558fdc494e6bc87,d549ccb95ca69b44a2b27fc1dcdc78714961ede0..04b9f248edafb3a3e3b8fa9ff4366c143982fd1d
@@@ -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)