summaryrefslogtreecommitdiffstats
path: root/kexi/kexidb/drivers/mySQL/mysqlconnection_p.h
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-09-08 20:05:18 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-09-08 20:05:36 +0200
commit3c395c2ebd223c43685a9fc5dcbb41aef05149b3 (patch)
tree161b7c83d6bf143043d25a19b5f461efd264c474 /kexi/kexidb/drivers/mySQL/mysqlconnection_p.h
parent2f8af82ffc0001f6a807d670aa1d69bbbac152ea (diff)
downloadkoffice-3c395c2ebd223c43685a9fc5dcbb41aef05149b3.tar.gz
koffice-3c395c2ebd223c43685a9fc5dcbb41aef05149b3.zip
Added detection whether the basic structure of MySQL / MariaDB
client is named st_mysql or MYSQL. This resolves FTBFS with MySQL client >= 8.0. This resolves issue #4. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit fa4a35fd4b069bde6cc6d924f18376096b644737)
Diffstat (limited to 'kexi/kexidb/drivers/mySQL/mysqlconnection_p.h')
-rw-r--r--kexi/kexidb/drivers/mySQL/mysqlconnection_p.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection_p.h b/kexi/kexidb/drivers/mySQL/mysqlconnection_p.h
index 85d8c57bd..9b1ad4022 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlconnection_p.h
+++ b/kexi/kexidb/drivers/mySQL/mysqlconnection_p.h
@@ -20,6 +20,10 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
#ifndef KEXIDB_MYSQLCLIENT_P_H
#define KEXIDB_MYSQLCLIENT_P_H
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
#include <kexidb/connection_p.h>
#ifdef TQ_WS_WIN
@@ -28,7 +32,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
#include <mysql_version.h>
#include <mysql.h>
-typedef struct st_mysql MYSQL;
+typedef struct MYSQL_STRUCT MYSQL;
#undef bool
class TQCString;