r11102: 06 Sep 2006 Kevin Rosenberg <kevin@rosenberg.net>

        * uffi/clsql-uffi-loader.lisp, db-mysql/mysql-loader.lisp: Change from using *features*
        to decide on 64-bit platform and check size of most-positive-fixnum instead.
        Needed to support clisp amd64.

diff --git a/ChangeLog b/ChangeLog
index f43bda4971fb7579857f51fc4fdeb8f90f706b2a..60394c6fec2bd62788cab8dc25adc2cdb8b26e0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+06 Sep 2006  Kevin Rosenberg <kevin@rosenberg.net>
+       * uffi/clsql-uffi-loader.lisp, db-mysql/mysql-loader.lisp: Change from using *features*
+       to decide on 64-bit platform and check size of most-positive-fixnum instead.
+       Needed to support clisp amd64.
+

 03 Sep 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.7.1
        * sql/metaclasses.lisp: Rework slot type's to be more AMOP
 03 Sep 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.7.1
        * sql/metaclasses.lisp: Rework slot type's to be more AMOP

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index 0ec9c03c2f74e592575605f6ececc8e776bfa609..1c27ad3c603d0526e4af6150b695648ee78ac70f 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -18,9 +18,10 @@
 
 (in-package #:mysql)
 
 
 (in-package #:mysql)
 

+;; searches clsql_mysql64 to accomodate both 32-bit and 64-bit libraries on same system

 (defparameter *clsql-mysql-library-candidate-names*
 (defparameter *clsql-mysql-library-candidate-names*

-  (list #+(or 64bit x86-64) "clsql_mysql64"
-        "clsql_mysql"))
+  `(,@(when (> most-positive-fixnum (expt 2 32)) (list "clsql_mysql64"))
+    "clsql_mysql"))

 
 (defvar *mysql-library-candidate-names*
   '("libmysqlclient" "libmysql"))
 
 (defvar *mysql-library-candidate-names*
   '("libmysqlclient" "libmysql"))

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index 084f66ae160fded631dbe9e4e33d623844c3d511..115209a9afda21a8de6af86f1c5b64be06fc7c98 100644 (file)
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -43,9 +43,10 @@ well as any of the filenames in any of the clsql:*foreign-library-search-paths*"
              (length filenames) filenames
              'clsql:*foreign-library-search-paths*)))))
 
              (length filenames) filenames
              '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*
 (defvar *clsql-uffi-library-filenames*

-  (list #+(or 64bit x86-64) "clsql_uffi64"
-       "clsql_uffi"))
+  `(,@(when (> most-positive-fixnum (expt 2 32)) (list "clsql_uffi64"))
+    "clsql_uffi"))

 
 (defvar *clsql-uffi-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to