r9956: * db-odbc/odbc-loader.lisp: Add /winnt/system32/ to

[clsql.git] / db-odbc / odbc-loader.lisp

diff --git a/db-odbc/odbc-loader.lisp b/db-odbc/odbc-loader.lisp
index 63e39d87d673dbe0c8ff4268dc162e3f8f8fa96e..07c77b0f968aa6026184dad8c6e7180080dd632d 100644 (file)
--- a/db-odbc/odbc-loader.lisp
+++ b/db-odbc/odbc-loader.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  April 2004
 ;;;;
-;;;; $Id: odbc-loader.lisp 8270 2003-11-25 06:37:14Z kevin $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2004 by Kevin M. Rosenberg
 ;;;;
@@ -22,12 +22,14 @@
   (uffi:find-foreign-library
    '("odbc32" "libodbc" "libiodbc")
    `(,(make-pathname :directory (pathname-directory *load-truename*))
-      "/usr/lib/"
-      "/sw/lib/"
-      "/usr/local/lib/"
-      "/home/kevin/debian/src/clsql/db-odbc/"
-      "/windows/system32/"
-      "/odbc/lib/opt/")
+     #+64bit "/usr/lib64/"
+     "/usr/lib/"
+     "/sw/lib/"
+     "/usr/local/lib/"
+     "/home/kevin/debian/src/clsql/db-odbc/"
+     "/windows/system32/"
+     "/winnt/system32/"
+     "/odbc/lib/opt/")
    :drive-letters '("C")))
   
 (defvar *odbc-supporting-libraries* '("c")
@@ -38,15 +40,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-sys:database-type-library-loaded ((database-type (eql :odbc)))
   *odbc-library-loaded*)
                                      
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :odbc)))
+(defmethod clsql-sys: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-sys:database-type-load-foreign :odbc)