X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-odbc%2Fodbc-loader.lisp;h=94206d8aa8342f1e270aef896a83cae0b6c1e891;hb=6684280691d01cc6d761f24288f9ea80d77bca29;hp=658da2e53faaca1ea403429d35535f2e063189ae;hpb=2f1e9becafa048960362bd6f9bb0f327045807cd;p=clsql.git

diff --git a/db-odbc/odbc-loader.lisp b/db-odbc/odbc-loader.lisp
index 658da2e..94206d8 100644
--- a/db-odbc/odbc-loader.lisp
+++ b/db-odbc/odbc-loader.lisp
@@ -22,10 +22,12 @@
   (uffi:find-foreign-library
    '("odbc32" "libodbc" "libiodbc")
    `(,(make-pathname :directory (pathname-directory *load-truename*))
+     #+64bit "/usr/lib64/"
       "/usr/lib/"
       "/sw/lib/"
       "/usr/local/lib/"
       "/home/kevin/debian/src/clsql/db-odbc/"
+      "/windows/system32/"
       "/odbc/lib/opt/")
    :drive-letters '("C")))
   
@@ -37,14 +39,15 @@ set to the right path before compiling or loading the system.")
 (defvar *odbc-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :odbc)))
+(defmethod clsql-base:database-type-library-loaded ((database-type (eql :odbc)))
   *odbc-library-loaded*)
 				      
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :odbc)))
-  (uffi:load-foreign-library *odbc-library-path*) 
+(defmethod clsql-base:database-type-load-foreign ((database-type (eql :odbc)))
+  (uffi:load-foreign-library *odbc-library-path*
+			     :module "odbc") 
   (setq *odbc-library-loaded* t))
 
-(clsql-base-sys:database-type-load-foreign :odbc)
+(clsql-base:database-type-load-foreign :odbc)