From eb21ebac347671b183a2250bbb4f233e66bf86d6 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 8 Jul 2003 20:15:13 +0000 Subject: [PATCH] r5260: *** empty log message *** --- db-mysql/mysql-api.lisp | 14 +++++++++----- uffi/clsql-uffi-loader.lisp | 5 ++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp index b334ad0..363ecb9 100644 --- a/db-mysql/mysql-api.lisp +++ b/db-mysql/mysql-api.lisp @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: mysql-api.lisp,v 1.4 2003/06/24 01:12:57 kevin Exp $ +;;;; $Id: mysql-api.lisp,v 1.5 2003/07/08 20:15:13 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -105,8 +105,12 @@ (:blob 252) (:var-string 253) (:string 254))) - -#-(or win32 mswindows) + +#-(or mysql-client-v3 mysql-client-v4) +(eval-when (:compile-toplevel :load-toplevel :execute) + (pushnew :mysql-client-v3 cl:*features*)) + +#+mysql-client-v3 (uffi:def-struct mysql-field (name (* :char)) (table (* :char)) @@ -117,8 +121,8 @@ (flags :unsigned-int) (decimals :unsigned-int)) -;; structure changed in mysql 4.0.12, win32 -#+(or win32 mswindows) +;; structure changed in mysql 4 client +#+mysql-client-v4 (uffi:def-struct mysql-field (name (* :char)) (table (* :char)) diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp index be988e1..fc9f3d8 100644 --- a/uffi/clsql-uffi-loader.lisp +++ b/uffi/clsql-uffi-loader.lisp @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: clsql-uffi-loader.lisp,v 1.4 2003/05/17 06:03:03 kevin Exp $ +;;;; $Id: clsql-uffi-loader.lisp,v 1.5 2003/07/08 20:15:13 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,8 +16,7 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :clsql-uffi) +(in-package #:clsql-uffi) (defvar *clsql-uffi-library-filename* (uffi:find-foreign-library -- 2.34.1