diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2010-04-18 15:32:05 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2010-04-18 15:32:05 +0200 |
| commit | 4b68b2d289ab338d5bd9c6f15d64e31a1d4be0dc (patch) | |
| tree | c875ec9df2c1c5133605fe134c52fdb4dc1c30b9 /include | |
| parent | 091745c8a571e36a0bc4bb1f2230ef2aa81c00a7 (diff) | |
| parent | c62d8e5cb5ae57cedd08f761e99cab0e98f8496a (diff) | |
| download | mariadb-git-4b68b2d289ab338d5bd9c6f15d64e31a1d4be0dc.tar.gz | |
Merge the changes of the 5.5.3-m3 release build
back into the development branches.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 67973ebd560..094853cb642 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 |