Commit c62d8e5c authored by Daniel Fischer's avatar Daniel Fischer Committed by MySQL Build Team

Make the libraries we produce on Windows actually usable

parent 8b79e620
...@@ -18,6 +18,11 @@ ...@@ -18,6 +18,11 @@
#ifndef _global_h #ifndef _global_h
#define _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 InnoDB depends on some MySQL internals which other plugins should not
need. This is because of InnoDB's foreign key support, "safe" binlog need. This is because of InnoDB's foreign key support, "safe" binlog
...@@ -1089,10 +1094,14 @@ typedef long long my_ptrdiff_t; ...@@ -1089,10 +1094,14 @@ typedef long long my_ptrdiff_t;
#define HUGE_PTR #define HUGE_PTR
#endif #endif
#endif #endif
#if defined(__IBMC__) || defined(__IBMCPP__)
/* This was _System _Export but caused a lot of warnings on _AIX43 */ #ifdef STDCALL
#define STDCALL #undef STDCALL
#elif !defined( STDCALL) #endif
#ifdef _WIN32
#define STDCALL __stdcall
#else
#define STDCALL #define STDCALL
#endif #endif
......
...@@ -249,6 +249,7 @@ cp include/mysql.h \ ...@@ -249,6 +249,7 @@ cp include/mysql.h \
include/decimal.h \ include/decimal.h \
include/errmsg.h \ include/errmsg.h \
include/my_global.h \ include/my_global.h \
include/my_config.h \
include/my_net.h \ include/my_net.h \
include/my_getopt.h \ include/my_getopt.h \
include/sslopt-longopts.h \ include/sslopt-longopts.h \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment