diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
| commit | 28f08d3753eb10a1393a63e6c581d43aad9f93b9 (patch) | |
| tree | 86c9df8c3fb6d4ebd99d431697c84f06ef242989 /config.h.cmake | |
| parent | 38665893087e20c3ad65d5b0e227a75185a4865e (diff) | |
| parent | f1bcfbb4373e40dda2c18c137f76fc6ff32e1a45 (diff) | |
| download | mariadb-git-28f08d3753eb10a1393a63e6c581d43aad9f93b9.tar.gz | |
Merge branch '10.1' into 10.2
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 3e5a9a95397..bbeb457fd13 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -569,12 +569,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 |