From: Kevin M. Rosenberg Date: Wed, 6 Sep 2006 12:51:12 +0000 (+0000) Subject: r11102: 06 Sep 2006 Kevin Rosenberg X-Git-Tag: v3.8.6~46 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=e44d25095946bbc8b5d175a09dc2e611eee319e7 r11102: 06 Sep 2006 Kevin Rosenberg * 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 f43bda4..60394c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +06 Sep 2006 Kevin Rosenberg + * 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 * 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 0ec9c03..1c27ad3 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -18,9 +18,10 @@ (in-package #:mysql) +;; searches clsql_mysql64 to accomodate both 32-bit and 64-bit libraries on same system (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")) diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp index 084f66a..115209a 100644 --- 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*))))) +;; searches clsql_uffi64 to accomodate both 32-bit and 64-bit libraries on same system (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