diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
| commit | d328d5be33cddff7dfcc736ecc993f11560f8152 (patch) | |
| tree | 6fc830df498046ca29b2381fb809726faeb04f52 /include/my_global.h | |
| parent | 5575d724cf1e40c467ab0eab934ce8846b452a9a (diff) | |
| parent | 0c8c4a7133f955603029b3bc31e45b5ef02516ca (diff) | |
| download | mariadb-git-d328d5be33cddff7dfcc736ecc993f11560f8152.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
Diffstat (limited to 'include/my_global.h')
| -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 540fabee6dd..6558e402586 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 |