Skip to content

Commit 69c400c

Browse files
committed
Fix for CONC-114: Windows version of libmariadb doesn't export all symbols
1 parent 0c07bd4 commit 69c400c

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

include/my_global.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
454454
#ifdef _WIN32
455455
#define NO_DIR_LIBRARY /* Not standar dir-library */
456456
#define USE_MY_STAT_STRUCT /* For my_lib */
457-
#ifndef _SIZE_T_DEFINED
457+
#ifdef _SIZE_T_DEFINED
458458
typedef SSIZE_T ssize_t;
459459
#endif
460460
#endif

include/mysql/client_plugin.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ typedef char *(*mysql_authentication_dialog_ask_t)(struct st_mysql *mysql,
138138
@retval
139139
a pointer to the loaded plugin, or NULL in case of a failure
140140
*/
141-
struct st_mysql_client_plugin *
141+
struct st_mysql_client_plugin * STDCALL
142142
mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
143143
int argc, ...);
144144

@@ -159,7 +159,7 @@ mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
159159
@retval
160160
a pointer to the loaded plugin, or NULL in case of a failure
161161
*/
162-
struct st_mysql_client_plugin *
162+
struct st_mysql_client_plugin * STDCALL
163163
mysql_load_plugin_v(struct st_mysql *mysql, const char *name, int type,
164164
int argc, va_list args);
165165

@@ -174,7 +174,7 @@ mysql_load_plugin_v(struct st_mysql *mysql, const char *name, int type,
174174
@retval
175175
a pointer to the plugin, or NULL in case of a failure
176176
*/
177-
struct st_mysql_client_plugin *
177+
struct st_mysql_client_plugin * STDCALL
178178
mysql_client_find_plugin(struct st_mysql *mysql, const char *name, int type);
179179

180180
/**
@@ -191,7 +191,7 @@ mysql_client_find_plugin(struct st_mysql *mysql, const char *name, int type);
191191
@retval
192192
a pointer to the plugin, or NULL in case of a failure
193193
*/
194-
struct st_mysql_client_plugin *
194+
struct st_mysql_client_plugin * STDCALL
195195
mysql_client_register_plugin(struct st_mysql *mysql,
196196
struct st_mysql_client_plugin *plugin);
197197

include/mysql_async.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
#ifndef MYSQL_ASYNC_H
1919
#define MYSQL_ASYNC_H
2020

21-
#ifdef _WIN32
22-
typedef SSIZE_T ssize_t;
23-
#endif
24-
2521
extern int my_connect_async(struct mysql_async_context *b, my_socket fd,
2622
const struct sockaddr *name, uint namelen,
2723
int vio_timeout);

libmariadb/client_plugin.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ void mysql_client_plugin_deinit()
306306
/************* public facing functions, for client consumption *********/
307307

308308
/* see <mysql/client_plugin.h> for a full description */
309-
struct st_mysql_client_plugin *
309+
struct st_mysql_client_plugin * STDCALL
310310
mysql_client_register_plugin(MYSQL *mysql,
311311
struct st_mysql_client_plugin *plugin)
312312
{
@@ -335,7 +335,7 @@ mysql_client_register_plugin(MYSQL *mysql,
335335

336336

337337
/* see <mysql/client_plugin.h> for a full description */
338-
struct st_mysql_client_plugin *
338+
struct st_mysql_client_plugin * STDCALL
339339
mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
340340
int argc, va_list args)
341341
{
@@ -423,7 +423,7 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
423423

424424

425425
/* see <mysql/client_plugin.h> for a full description */
426-
struct st_mysql_client_plugin *
426+
struct st_mysql_client_plugin * STDCALL
427427
mysql_load_plugin(MYSQL *mysql, const char *name, int type, int argc, ...)
428428
{
429429
struct st_mysql_client_plugin *p;
@@ -436,7 +436,7 @@ mysql_load_plugin(MYSQL *mysql, const char *name, int type, int argc, ...)
436436

437437

438438
/* see <mysql/client_plugin.h> for a full description */
439-
struct st_mysql_client_plugin *
439+
struct st_mysql_client_plugin * STDCALL
440440
mysql_client_find_plugin(MYSQL *mysql, const char *name, int type)
441441
{
442442
struct st_mysql_client_plugin *p;

0 commit comments

Comments
 (0)