diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-26 20:49:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-28 16:37:06 +0200 |
| commit | 57e0da50bbef8164635317785b67dd468a908327 (patch) | |
| tree | 89d1ed179afce8b040c8f2dfcfe179042ff27b2e /config.h.cmake | |
| parent | 7aba6f8f8853acd18d471793f8b72aa1412b8151 (diff) | |
| parent | dcbd51cee628d8d8fec9ff5476a6afc855b007aa (diff) | |
| download | mariadb-git-57e0da50bbef8164635317785b67dd468a908327.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config.h.cmake b/config.h.cmake index cdf3fd1a726..3974c2a3618 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -559,12 +559,8 @@ #cmakedefine WSREP_PROC_INFO 1 #endif -#ifdef _AIX -/* - AIX includes inttypes.h from sys/types.h - Explicitly request format macros before the first inclusion of inttypes.h -*/ +#if !defined(__STDC_FORMAT_MACROS) #define __STDC_FORMAT_MACROS -#endif +#endif // !defined(__STDC_FORMAT_MACROS) #endif |