From d4635150289e5d3d1fc0d9b411296648fe2f8049 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 22 Nov 2011 21:55:11 +0100 Subject: fix dialog plugin to work on windows --- include/mysql/client_plugin.h | 11 +++++++++++ include/mysql/plugin_auth_common.h | 4 ++++ 2 files changed, 15 insertions(+) (limited to 'include/mysql') diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h index 9c7b1aee9f9..fc4db6b6553 100644 --- a/include/mysql/client_plugin.h +++ b/include/mysql/client_plugin.h @@ -28,6 +28,16 @@ #include #endif +#if defined(_MSC_VER) + #ifdef __cplusplus + #define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport) + #else + #define MYSQL_PLUGIN_EXPORT __declspec(dllexport) + #endif +#else /*_MSC_VER */ +#define MYSQL_PLUGIN_EXPORT +#endif + /* known plugin types */ #define MYSQL_CLIENT_reserved1 0 #define MYSQL_CLIENT_reserved2 1 @@ -38,6 +48,7 @@ #define MYSQL_CLIENT_MAX_PLUGINS 3 #define mysql_declare_client_plugin(X) \ + MYSQL_PLUGIN_EXPORT \ struct st_mysql_client_plugin_ ## X \ _mysql_client_plugin_declaration_ = { \ MYSQL_CLIENT_ ## X ## _PLUGIN, \ diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h index b71591d6eb6..ed613b2a5ce 100644 --- a/include/mysql/plugin_auth_common.h +++ b/include/mysql/plugin_auth_common.h @@ -14,6 +14,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef _WIN32 +#include +#endif + /** @file -- cgit v1.2.1 From 82adfe7b2a695fd9357e1f2f04415fd1691956b8 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 29 Nov 2011 02:00:24 +0100 Subject: merge, fix Windows warnings --- include/mysql/client_plugin.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/mysql') diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h index fc4db6b6553..33c63b9df33 100644 --- a/include/mysql/client_plugin.h +++ b/include/mysql/client_plugin.h @@ -28,6 +28,9 @@ #include #endif +#ifdef MYSQL_PLUGIN_EXPORT +#undef MYSQL_PLUGIN_EXPORT +#endif #if defined(_MSC_VER) #ifdef __cplusplus #define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport) -- cgit v1.2.1