diff options
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/config.h.cmake b/config.h.cmake index 99a2ebdd093..e039cf12fca 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -27,7 +27,6 @@ #cmakedefine HAVE_BSEARCH 1 #cmakedefine HAVE_CRYPT_H 1 #cmakedefine HAVE_CURSES_H 1 -#cmakedefine HAVE_CXXABI_H 1 #cmakedefine HAVE_BFD_H 1 #cmakedefine HAVE_NCURSES_H 1 #cmakedefine HAVE_NDIR_H 1 @@ -41,7 +40,6 @@ #cmakedefine HAVE_FNMATCH_H 1 #cmakedefine HAVE_FPU_CONTROL_H 1 #cmakedefine HAVE_GRP_H 1 -#cmakedefine HAVE_EXPLICIT_TEMPLATE_INSTANTIATION 1 #cmakedefine HAVE_IA64INTRIN_H 1 #cmakedefine HAVE_IEEEFP_H 1 #cmakedefine HAVE_INTTYPES_H 1 @@ -409,6 +407,7 @@ #cmakedefine SIGNAL_RETURN_TYPE_IS_VOID 1 #cmakedefine RETSIGTYPE @RETSIGTYPE@ #cmakedefine VOID_SIGHANDLER 1 +#cmakedefine HAVE_SIGHANDLER_T 1 #define STRUCT_RLIMIT struct rlimit #ifdef __APPLE__ @@ -475,6 +474,7 @@ #cmakedefine MY_ATOMIC_MODE_DUMMY 1 #cmakedefine MY_ATOMIC_MODE_RWLOCKS 1 #cmakedefine HAVE_GCC_ATOMIC_BUILTINS 1 +#cmakedefine HAVE_GCC_C11_ATOMICS 1 #cmakedefine HAVE_SOLARIS_ATOMIC 1 #cmakedefine HAVE_DECL_SHM_HUGETLB 1 #cmakedefine HAVE_LARGE_PAGES 1 @@ -492,6 +492,7 @@ #define SYSTEM_TYPE "@SYSTEM_TYPE@" #define MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@" +#define DEFAULT_MACHINE "@DEFAULT_MACHINE@" #cmakedefine HAVE_DTRACE 1 #cmakedefine SIGNAL_WITH_VIO_CLOSE 1 @@ -527,6 +528,11 @@ #endif #define PSAPI_VERSION 1 /* for GetProcessMemoryInfo() */ +/* We don't want the min/max macros */ +#ifdef __WIN__ +#define NOMINMAX 1 +#endif + /* MySQL features */ @@ -629,8 +635,10 @@ #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@" -#define MYSQL_MAJOR_VERSION @MAJOR_VERSION@ -#define MYSQL_MINOR_VERSION @MINOR_VERSION@ +#define MYSQL_VERSION_MAJOR @MAJOR_VERSION@ +#define MYSQL_VERSION_MINOR @MINOR_VERSION@ +#define MYSQL_VERSION_PATCH @PATCH_VERSION@ +#define MYSQL_VERSION_EXTRA "@EXTRA_VERSION@" #define PACKAGE "mysql" #define PACKAGE_BUGREPORT "" @@ -641,10 +649,19 @@ #define VERSION "@VERSION@" #define PROTOCOL_VERSION 10 +#define MALLOC_LIBRARY "@MALLOC_LIBRARY@" /* time_t related defines */ #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@ #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@ +#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 + #endif |