summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/my_global.h17
-rwxr-xr-xscripts/make_win_bin_dist1
2 files changed, 14 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h
index b4bc61e0a48..c0a55e0f4e4 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -18,6 +18,11 @@
#ifndef _global_h
#define _global_h
+/* Client library users on Windows need this macro defined here. */
+#if !defined(__WIN__) && defined(_WIN32)
+#define __WIN__
+#endif
+
/*
InnoDB depends on some MySQL internals which other plugins should not
need. This is because of InnoDB's foreign key support, "safe" binlog
@@ -1089,10 +1094,14 @@ typedef long long my_ptrdiff_t;
#define HUGE_PTR
#endif
#endif
-#if defined(__IBMC__) || defined(__IBMCPP__)
-/* This was _System _Export but caused a lot of warnings on _AIX43 */
-#define STDCALL
-#elif !defined( STDCALL)
+
+#ifdef STDCALL
+#undef STDCALL
+#endif
+
+#ifdef _WIN32
+#define STDCALL __stdcall
+#else
#define STDCALL
#endif
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index 7e8428bfe5c..9af722f7afc 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -249,6 +249,7 @@ cp include/mysql.h \
include/decimal.h \
include/errmsg.h \
include/my_global.h \
+ include/my_config.h \
include/my_net.h \
include/my_getopt.h \
include/sslopt-longopts.h \