diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-02-27 19:44:00 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-02-27 19:44:00 +0400 |
| commit | 57cdc561fc2b97c3d1d2b318fc0fa2410568c3d6 (patch) | |
| tree | 8d61425ec6fed1b66faa46c1ad7ac1bc080df71e /include/my_global.h | |
| parent | 11826b1bcfc2280e36a72c1516443c9b400edec2 (diff) | |
| download | mariadb-git-57cdc561fc2b97c3d1d2b318fc0fa2410568c3d6.tar.gz | |
Fixing AIX compilation failires
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 55abb407872..9f47e5dcc63 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -144,6 +144,7 @@ /* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */ #if defined(_AIX) && defined(_LARGE_FILE_API) #undef _LARGE_FILE_API +#undef __GNUG__ #endif /* @@ -264,6 +265,16 @@ #endif #endif + +#ifdef _AIX +/* + AIX includes inttypes.h from sys/types.h + Explicitly request format macros before the first inclusion of inttypes.h +*/ +#define __STDC_FORMAT_MACROS +#endif + + #if !defined(__WIN__) #ifndef _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */ @@ -316,6 +327,13 @@ C_MODE_END #define _LONG_LONG 1 /* For AIX string library */ #endif +/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */ +#if defined(_AIX) && defined(_LARGE_FILE_API) +#undef _LARGE_FILE_API +#undef __GNUG__ +#endif + + #ifndef stdin #include <stdio.h> #endif @@ -341,6 +359,14 @@ C_MODE_END #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif + +/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */ +#if defined(_AIX) && defined(_LARGE_FILE_API) +#undef _LARGE_FILE_API +#undef __GNUG__ +#endif + + #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -1221,4 +1247,11 @@ static inline double rint(double x) #define DEFAULT_TMPDIR P_tmpdir #endif +/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */ +#if defined(_AIX) && defined(_LARGE_FILE_API) +#undef _LARGE_FILE_API +#undef __GNUG__ +#endif + + #endif /* my_global_h */ |