From e7d3c396e803dc0dcc5acb773de5c872568c66e3 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sun, 24 Oct 2004 04:32:58 +0000
Subject: [PATCH] r10115: improvments for loading on 64-bit systems

---
 db-mysql/mysql-loader.lisp  | 4 ++--
 uffi/clsql-uffi-loader.lisp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index db664e7..f3b556e 100644
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -20,7 +20,7 @@
 
 (defparameter *clsql-mysql-library-path* 
   (uffi:find-foreign-library
-   "mysql"
+   '(#+64bit "mysql64" "mysql")
    `(,clsql-mysql-system::*library-file-dir*
      "/usr/lib/clsql/"
      "/sw/lib/clsql/")
@@ -32,7 +32,7 @@
 (defparameter *mysql-library-candidate-directories*
     `(,(pathname-directory *load-pathname*)
       "/opt/mysql/lib/mysql/" "/usr/local/lib/"
-      #+64bit "/usr/lib64/"
+      #+64bit "/usr/lib64/" #+64bit "/usr/local/lib64/mysql/"
       "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/" "/opt/local/lib/mysql/"))
 
 (defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index 10ac445..5306988 100644
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -20,7 +20,7 @@
 
 (defvar *clsql-uffi-library-filename* 
   (uffi:find-foreign-library
-   "uffi"
+   '(#+64bit "uffi64" "uffi")
    `(,clsql-uffi-system::*library-file-dir*
      "/usr/lib/clsql/")
    :drive-letters '("C")))
-- 
2.34.1