database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Cleanup - do not dllexport statically built plugins

Browse Source
This commit is contained in:
Vladislav Vaintroub
2019-06-28 15:53:49 +02:00
parent 6dc71d4f10
commit db80f04751
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysql.cc
View File

@@ -4636,7 +4636,10 @@ static char *get_arg(char *line, get_arg_mode mode)
string, and the "dialog" plugin will free() it. string, and the "dialog" plugin will free() it.
*/ */
MYSQL_PLUGIN_EXPORT extern "C"
#ifdef _MSC_VER
__declspec(dllexport)
#endif
char *mysql_authentication_dialog_ask(MYSQL *mysql, int type, char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
const char *prompt, const char *prompt,
char *buf, int buf_len) char *buf, int buf_len)

5
client/mysqltest.cc
View File

@@ -11282,7 +11282,10 @@ static int setenv(const char *name, const char *value, int overwrite)
that always reads from stdin with explicit echo. that always reads from stdin with explicit echo.
*/ */
MYSQL_PLUGIN_EXPORT extern "C"
#ifdef _MSC_VER
__declspec(dllexport)
#endif
char *mysql_authentication_dialog_ask(MYSQL *mysql, int type, char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
const char *prompt, const char *prompt,
char *buf, int buf_len) char *buf, int buf_len)

22
include/mysql/plugin.h
View File

@@ -23,18 +23,20 @@
unlike other compilers, uses C++ mangling for variables not only unlike other compilers, uses C++ mangling for variables not only
for functions. for functions.
*/ */
#if defined(_MSC_VER) #ifdef MYSQL_DYNAMIC_PLUGIN
#ifdef __cplusplus #ifdef _MSC_VER
#define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport) #define MYSQL_DLLEXPORT _declspec(dllexport)
#else #else
#define MYSQL_PLUGIN_EXPORT __declspec(dllexport) #define MYSQL_DLLEXPORT
#endif
#else /*_MSC_VER */
#ifdef __cplusplus
#define MYSQL_PLUGIN_EXPORT extern "C"
#else
#define MYSQL_PLUGIN_EXPORT
#endif #endif
#else
#define MYSQL_DLLEXPORT
#endif
#ifdef __cplusplus
#define MYSQL_PLUGIN_EXPORT extern "C" MYSQL_DLLEXPORT
#else
#define MYSQL_PLUGIN_EXPORT MYSQL_DLLEXPORT
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus