diff options
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/config.h.cmake b/config.h.cmake index 4b0769d5cfa..86ebf43ef24 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -41,7 +41,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 @@ -521,6 +520,11 @@ #endif #define PSAPI_VERSION 1 /* for GetProcessMemoryInfo() */ +/* We don't want the min/max macros */ +#ifdef __WIN__ +#define NOMINMAX +#endif + /* MySQL features */ @@ -623,8 +627,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 "" @@ -635,12 +641,21 @@ #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 + /* stat structure (from <sys/stat.h>) is conditionally defined to have different layout and size depending on the defined macros. |