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 /include/my_global.h | |
| parent | 7aba6f8f8853acd18d471793f8b72aa1412b8151 (diff) | |
| parent | dcbd51cee628d8d8fec9ff5476a6afc855b007aa (diff) | |
| download | mariadb-git-57e0da50bbef8164635317785b67dd468a908327.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 11d17ad146a..10704a89842 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -246,7 +246,9 @@ AIX includes inttypes.h from sys/types.h Explicitly request format macros before the first inclusion of inttypes.h */ -#define __STDC_FORMAT_MACROS +#if !defined(__STDC_FORMAT_MACROS) +#define __STDC_FORMAT_MACROS +#endif // !defined(__STDC_FORMAT_MACROS) #endif |