database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Fix for CONC-114: Windows version of libmariadb doesn't export all symbols

Browse Source
This commit is contained in:
Georg Richter
2014-11-13 13:54:45 +01:00
parent 0c07bd4183
commit 69c400caaf
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_global.h
View File

@@ -454,7 +454,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
#ifdef _WIN32 #ifdef _WIN32
#define NO_DIR_LIBRARY /* Not standar dir-library */ #define NO_DIR_LIBRARY /* Not standar dir-library */
#define USE_MY_STAT_STRUCT /* For my_lib */ #define USE_MY_STAT_STRUCT /* For my_lib */
#ifndef _SIZE_T_DEFINED #ifdef _SIZE_T_DEFINED
typedef SSIZE_T ssize_t; typedef SSIZE_T ssize_t;
#endif #endif
#endif #endif

8
include/mysql/client_plugin.h
View File

@@ -138,7 +138,7 @@ typedef char *(*mysql_authentication_dialog_ask_t)(struct st_mysql *mysql,
@retval @retval
a pointer to the loaded plugin, or NULL in case of a failure a pointer to the loaded plugin, or NULL in case of a failure
*/ */
struct st_mysql_client_plugin * struct st_mysql_client_plugin * STDCALL
mysql_load_plugin(struct st_mysql *mysql, const char *name, int type, mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
int argc, ...); int argc, ...);
@@ -159,7 +159,7 @@ mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
@retval @retval
a pointer to the loaded plugin, or NULL in case of a failure a pointer to the loaded plugin, or NULL in case of a failure
*/ */
struct st_mysql_client_plugin * struct st_mysql_client_plugin * STDCALL
mysql_load_plugin_v(struct st_mysql *mysql, const char *name, int type, mysql_load_plugin_v(struct st_mysql *mysql, const char *name, int type,
int argc, va_list args); int argc, va_list args);
@@ -174,7 +174,7 @@ mysql_load_plugin_v(struct st_mysql *mysql, const char *name, int type,
@retval @retval
a pointer to the plugin, or NULL in case of a failure a pointer to the plugin, or NULL in case of a failure
*/ */
struct st_mysql_client_plugin * struct st_mysql_client_plugin * STDCALL
mysql_client_find_plugin(struct st_mysql *mysql, const char *name, int type); mysql_client_find_plugin(struct st_mysql *mysql, const char *name, int type);
/** /**
@@ -191,7 +191,7 @@ mysql_client_find_plugin(struct st_mysql *mysql, const char *name, int type);
@retval @retval
a pointer to the plugin, or NULL in case of a failure a pointer to the plugin, or NULL in case of a failure
*/ */
struct st_mysql_client_plugin * struct st_mysql_client_plugin * STDCALL
mysql_client_register_plugin(struct st_mysql *mysql, mysql_client_register_plugin(struct st_mysql *mysql,
struct st_mysql_client_plugin *plugin); struct st_mysql_client_plugin *plugin);

4
include/mysql_async.h
View File

@@ -18,10 +18,6 @@
#ifndef MYSQL_ASYNC_H #ifndef MYSQL_ASYNC_H
#define MYSQL_ASYNC_H #define MYSQL_ASYNC_H
#ifdef _WIN32
typedef SSIZE_T ssize_t;
#endif
extern int my_connect_async(struct mysql_async_context *b, my_socket fd, extern int my_connect_async(struct mysql_async_context *b, my_socket fd,
const struct sockaddr *name, uint namelen, const struct sockaddr *name, uint namelen,
int vio_timeout); int vio_timeout);

8
libmariadb/client_plugin.c
View File

@@ -306,7 +306,7 @@ void mysql_client_plugin_deinit()
/************* public facing functions, for client consumption *********/ /************* public facing functions, for client consumption *********/
/* see <mysql/client_plugin.h> for a full description */ /* see <mysql/client_plugin.h> for a full description */
struct st_mysql_client_plugin * struct st_mysql_client_plugin * STDCALL
mysql_client_register_plugin(MYSQL *mysql, mysql_client_register_plugin(MYSQL *mysql,
struct st_mysql_client_plugin *plugin) struct st_mysql_client_plugin *plugin)
{ {
@@ -335,7 +335,7 @@ mysql_client_register_plugin(MYSQL *mysql,
/* see <mysql/client_plugin.h> for a full description */ /* see <mysql/client_plugin.h> for a full description */
struct st_mysql_client_plugin * struct st_mysql_client_plugin * STDCALL
mysql_load_plugin_v(MYSQL *mysql, const char *name, int type, mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
int argc, va_list args) int argc, va_list args)
{ {
@@ -423,7 +423,7 @@ err:
/* see <mysql/client_plugin.h> for a full description */ /* see <mysql/client_plugin.h> for a full description */
struct st_mysql_client_plugin * struct st_mysql_client_plugin * STDCALL
mysql_load_plugin(MYSQL *mysql, const char *name, int type, int argc, ...) mysql_load_plugin(MYSQL *mysql, const char *name, int type, int argc, ...)
{ {
struct st_mysql_client_plugin *p; struct st_mysql_client_plugin *p;
@@ -436,7 +436,7 @@ mysql_load_plugin(MYSQL *mysql, const char *name, int type, int argc, ...)
/* see <mysql/client_plugin.h> for a full description */ /* see <mysql/client_plugin.h> for a full description */
struct st_mysql_client_plugin * struct st_mysql_client_plugin * STDCALL
mysql_client_find_plugin(MYSQL *mysql, const char *name, int type) mysql_client_find_plugin(MYSQL *mysql, const char *name, int type)
{ {
struct st_mysql_client_plugin *p; struct st_mysql_client_plugin *p;