database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

10.2-integration:

Browse Source 
Avoid redefinition of plugin structure (mysql_client_test)
This commit is contained in:
Georg Richter
2016-02-18 11:24:07 +01:00
parent 409d673291
commit 542a6f7388
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysql.h
View File

@@ -414,8 +414,7 @@ typedef struct character_set
#include "mariadb_stmt.h" #include "mariadb_stmt.h"
#ifndef _have_client_plugin_declarations_ #ifndef MYSQL_CLIENT_PLUGIN_HEADER
#define _have_client_plugin_declarations_
#define MYSQL_CLIENT_PLUGIN_HEADER \ #define MYSQL_CLIENT_PLUGIN_HEADER \
int type; \ int type; \
unsigned int interface_version; \ unsigned int interface_version; \

2
include/mysql/client_plugin.h
View File

@@ -67,6 +67,7 @@
#define mysql_end_client_plugin } #define mysql_end_client_plugin }
/* generic plugin header structure */ /* generic plugin header structure */
#ifndef MYSQL_CLIENT_PLUGIN_HEADER
#define MYSQL_CLIENT_PLUGIN_HEADER \ #define MYSQL_CLIENT_PLUGIN_HEADER \
int type; \ int type; \
unsigned int interface_version; \ unsigned int interface_version; \
@@ -81,6 +82,7 @@ struct st_mysql_client_plugin
{ {
MYSQL_CLIENT_PLUGIN_HEADER MYSQL_CLIENT_PLUGIN_HEADER
}; };
#endif
struct st_mysql; struct st_mysql;