From bf641c516d77330e150d0f1b07fd02dceaae3ef4 Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Sun, 26 Jul 2009 17:32:28 -0600 Subject: [PATCH] Update changelog for recent changes --- clsql-mysql.asd | 6 +++--- clsql-uffi.asd | 2 +- clsql.asd | 2 +- db-mysql/clsql_mysql.c | 2 +- debian/changelog | 7 +++++++ uffi/clsql_uffi.c | 4 ++-- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/clsql-mysql.asd b/clsql-mysql.asd index a176f85..2247697 100644 --- a/clsql-mysql.asd +++ b/clsql-mysql.asd @@ -37,7 +37,7 @@ (probe-file (make-pathname :directory dir :name (component-name c) :type library-file-type))) - '((:absolute "usr" "lib" "clsql"))))) + '((:absolute "usr" "lib" "clsql"))))) (list (if found found (make-pathname :name (component-name c) @@ -50,11 +50,11 @@ (defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file)) (and (symbol-function (intern (symbol-name '#:mysql-get-client-info) (find-package '#:mysql))) - t)) + t)) (defmethod perform ((o compile-op) (c clsql-mysql-source-file)) (unless (operation-done-p o c) - #-(or win32 mswindows) + #-(or win32 win64 windows mswindows) (unless (zerop (run-shell-command #-freebsd "cd ~A; make" #+freebsd "cd ~A; gmake" diff --git a/clsql-uffi.asd b/clsql-uffi.asd index e5a75f6..ed556ee 100644 --- a/clsql-uffi.asd +++ b/clsql-uffi.asd @@ -56,7 +56,7 @@ (defmethod perform ((o compile-op) (c clsql-uffi-source-file)) (unless (operation-done-p o c) - #-(or win32 mswindows) + #-(or win32 win64 windows mswindows) (unless (zerop (run-shell-command #-(or freebsd netbsd) "cd ~A; make" #+(or freebsd netbsd) "cd ~A; gmake" diff --git a/clsql.asd b/clsql.asd index 35e172a..0e1a302 100644 --- a/clsql.asd +++ b/clsql.asd @@ -104,7 +104,7 @@ oriented interface." (namestring (user-homedir-pathname)) ".clsql-init.lisp")) (probe-file "/etc/clsql-init.lisp") - #+(or mswin windows win32) + #+(or mswin windows win32 win64 mswindows) (probe-file "c:\\etc\\clsql-init.lisp")))) (when init-file (load init-file)))) diff --git a/db-mysql/clsql_mysql.c b/db-mysql/clsql_mysql.c index 327f14e..2d3b128 100644 --- a/db-mysql/clsql_mysql.c +++ b/db-mysql/clsql_mysql.c @@ -15,7 +15,7 @@ * (http://opensource.franz.com/preamble.html), also known as the LLGPL. ***************************************************************************/ -#ifdef WIN32 +#if defined(WIN32)||defined(WIN64) #include BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason, diff --git a/debian/changelog b/debian/changelog index e22423c..1353616 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cl-sql (4.0.5-1) unstable; urgency=low + + * New upstream version + * Change build dependency to be independent of libmysqlclient version (closes:538459) + + -- Kevin M. Rosenberg Sun, 26 Jul 2009 17:30:19 -0600 + cl-sql (4.0.4-1) unstable; urgency=low * Update Oracle FFI based on changes in CLSQL. Thanks to Paul diff --git a/uffi/clsql_uffi.c b/uffi/clsql_uffi.c index 0b84054..39754ff 100644 --- a/uffi/clsql_uffi.c +++ b/uffi/clsql_uffi.c @@ -15,7 +15,7 @@ * (http://opensource.franz.com/preamble.html), also known as the LLGPL. ***************************************************************************/ -#ifdef WIN32 +#if defined(WIN32)||defined(WIN64) #include BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason, @@ -41,7 +41,7 @@ DLLEXPORT unsigned int atol64 (const unsigned char* str, unsigned int* pHigh32) { -#ifdef WIN32 +#if defined(WIN32)||defined(WIN64) __int64 result = 0; #else long long result = 0; -- 2.34.1