diff options
author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-29 02:00:24 +0100 |
---|---|---|
committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-29 02:00:24 +0100 |
commit | 82adfe7b2a695fd9357e1f2f04415fd1691956b8 (patch) | |
tree | 2e40b547655593fd7d5fd74b0f610cbf168a6763 /include | |
parent | e79847d16a0f51137ca46f23af7d5276dce7952d (diff) | |
download | mariadb-git-82adfe7b2a695fd9357e1f2f04415fd1691956b8.tar.gz |
merge, fix Windows warnings
Diffstat (limited to 'include')
-rw-r--r-- | include/mysql/client_plugin.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 <stdlib.h> #endif +#ifdef MYSQL_PLUGIN_EXPORT +#undef MYSQL_PLUGIN_EXPORT +#endif #if defined(_MSC_VER) #ifdef __cplusplus #define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport) |