summaryrefslogtreecommitdiff
path: root/include/mysql
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael.ronstrom@oracle.com>2011-05-04 11:08:07 +0200
committerMikael Ronstrom <mikael.ronstrom@oracle.com>2011-05-04 11:08:07 +0200
commitb444c4f2d3e1020a5469f12e5ae460be85925c10 (patch)
tree1d793c1b656afcb9c915a1ee3bf5ec796c2fcf78 /include/mysql
parenta24ba2276261d48f8a2e46342c7cdb1ee18a8be3 (diff)
parent0e647bc72d5e261e11245bf512e5ea37245ea90f (diff)
downloadmariadb-git-b444c4f2d3e1020a5469f12e5ae460be85925c10.tar.gz
merge
Diffstat (limited to 'include/mysql')
-rw-r--r--include/mysql/client_plugin.h5
-rw-r--r--include/mysql/client_plugin.h.pp5
2 files changed, 4 insertions, 6 deletions
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h
index cc3f468040f..6b37170aeab 100644
--- a/include/mysql/client_plugin.h
+++ b/include/mysql/client_plugin.h
@@ -156,8 +156,7 @@ mysql_client_register_plugin(struct st_mysql *mysql,
@retval 0 on success, 1 in case of failure
**/
-int STDCALL mysql_plugin_options(struct st_mysql_client_plugin *plugin,
- const char *option,
- const void *value);
+int mysql_plugin_options(struct st_mysql_client_plugin *plugin,
+ const char *option, const void *value);
#endif
diff --git a/include/mysql/client_plugin.h.pp b/include/mysql/client_plugin.h.pp
index e508f821aad..93eaff7501e 100644
--- a/include/mysql/client_plugin.h.pp
+++ b/include/mysql/client_plugin.h.pp
@@ -35,6 +35,5 @@ mysql_client_find_plugin(struct st_mysql *mysql, const char *name, int type);
struct st_mysql_client_plugin *
mysql_client_register_plugin(struct st_mysql *mysql,
struct st_mysql_client_plugin *plugin);
-int STDCALL mysql_plugin_options(struct st_mysql_client_plugin *plugin,
- const char *option,
- const void *value);
+int mysql_plugin_options(struct st_mysql_client_plugin *plugin,
+ const char *option, const void *value);