From 542a6f7388767bcb8ca720ef0bd8e3951054d152 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Thu, 18 Feb 2016 11:24:07 +0100 Subject: [PATCH] 10.2-integration: Avoid redefinition of plugin structure (mysql_client_test) --- include/mysql.h | 3 +-- include/mysql/client_plugin.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/mysql.h b/include/mysql.h index 059a445f..75872b42 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -414,8 +414,7 @@ typedef struct character_set #include "mariadb_stmt.h" -#ifndef _have_client_plugin_declarations_ -#define _have_client_plugin_declarations_ +#ifndef MYSQL_CLIENT_PLUGIN_HEADER #define MYSQL_CLIENT_PLUGIN_HEADER \ int type; \ unsigned int interface_version; \ diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h index 71dd06ad..9d855c68 100644 --- a/include/mysql/client_plugin.h +++ b/include/mysql/client_plugin.h @@ -67,6 +67,7 @@ #define mysql_end_client_plugin } /* generic plugin header structure */ +#ifndef MYSQL_CLIENT_PLUGIN_HEADER #define MYSQL_CLIENT_PLUGIN_HEADER \ int type; \ unsigned int interface_version; \ @@ -81,6 +82,7 @@ struct st_mysql_client_plugin { MYSQL_CLIENT_PLUGIN_HEADER }; +#endif struct st_mysql;