r8811: add support for usql backend, integrate Marcus Pearce <ek735@soi.city.ac.uk...

[clsql.git] / db-mysql / mysql-api.lisp

diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp
index b3220b7bc99a44b72041cdc3bebe6e5191f3ebca..7170fda066b72a29f480c80e0dc04422eecb5c1f 100644 (file)
--- a/db-mysql/mysql-api.lisp
+++ b/db-mysql/mysql-api.lisp
@@ -106,11 +106,7 @@
      (:var-string 253)
      (:string 254)))
 
-#-(or :mysql-client-v3 :mysql-client-v4)
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (pushnew :mysql-client-v3 cl:*features*))
-
-#+:mysql-client-v3
+#+mysql-client-v3
 (uffi:def-struct mysql-field
     (name (* :char))
   (table (* :char))
@@ -122,7 +118,7 @@
   (decimals :unsigned-int))
 
 ;; structure changed in mysql 4 client
-#+:mysql-client-v4
+#+mysql-client-v4
 (uffi:def-struct mysql-field
     (name (* :char))
   (table (* :char))
@@ -264,7 +260,7 @@
 
 ;; Need to comment this out for LW 4.2.6
 ;; ? bug in LW version
-;;(declaim (inline mysql-real-connect))
+#-lispworks (declaim (inline mysql-real-connect))
 (uffi:def-function "mysql_real_connect"
     ((mysql (* mysql-mysql))
      (host :cstring)
@@ -370,12 +366,6 @@
   :module "mysql"
   :returning :cstring)
 
-(declaim (inline mysql-get-client-info))
-(uffi:def-function "mysql_get_client_info"
-    ()
-  :module "mysql"
-  :returning :cstring)
-
 (declaim (inline mysql-get-host-info))
 (uffi:def-function "mysql_get_host_info"
     ((mysql (* mysql-mysql)))