diff options
| author | Daniel Fischer <df@sun.com> | 2010-05-27 16:11:13 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2010-05-27 16:11:13 +0200 |
| commit | 458d0e7ae06016f56614c602d7e5be568779937a (patch) | |
| tree | 3aa70bdbd1adb50dc6c5a0f463078e1d1b8d400d /include | |
| parent | bfe544e46b6873500f171ac8ef3a8322cf88f7e6 (diff) | |
| parent | 3c5aef7dc7945bcad63df61845e0e244a8890af3 (diff) | |
| download | mariadb-git-458d0e7ae06016f56614c602d7e5be568779937a.tar.gz | |
merge
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 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 |