summaryrefslogtreecommitdiff
path: root/include/mysql
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-22 21:55:11 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-22 21:55:11 +0100
commitd4635150289e5d3d1fc0d9b411296648fe2f8049 (patch)
tree2550dbd9268100548a89a919e1a3a764c0a26700 /include/mysql
parentef45b799245d4c33770339619dab4d717b1e552f (diff)
downloadmariadb-git-d4635150289e5d3d1fc0d9b411296648fe2f8049.tar.gz
fix dialog plugin to work on windows
Diffstat (limited to 'include/mysql')
-rw-r--r--include/mysql/client_plugin.h11
-rw-r--r--include/mysql/plugin_auth_common.h4
2 files changed, 15 insertions, 0 deletions
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 <stdlib.h>
#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 <windows.h>
+#endif
+
/**
@file