diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 15:52:14 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 15:52:14 +0100 |
| commit | beded7d9c9592ca8fdfc367f7c64f89c35995c44 (patch) | |
| tree | a215a54ed5043bb17fe7d69a69439e05b21682d5 /config.h.cmake | |
| parent | af71da5d2f90c82b2357e808640003907c488bc2 (diff) | |
| parent | 2553f143fdeb9068eb02a8fda58750c24071f5ef (diff) | |
| download | mariadb-git-beded7d9c9592ca8fdfc367f7c64f89c35995c44.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index 96165c16aa0..cc54511e360 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -325,6 +325,8 @@ #cmakedefine HAVE_TIMESPEC_TS_SEC 1 #cmakedefine STRUCT_DIRENT_HAS_D_INO 1 #cmakedefine STRUCT_DIRENT_HAS_D_NAMLEN 1 +#cmakedefine STRUCT_TIMESPEC_HAS_TV_SEC 1 +#cmakedefine STRUCT_TIMESPEC_HAS_TV_NSEC 1 #cmakedefine SPRINTF_RETURNS_INT 1 #define USE_MB 1 @@ -496,6 +498,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 @@ -521,6 +524,10 @@ #cmakedefine strtoll @strtoll@ #cmakedefine strtoull @strtoull@ #cmakedefine vsnprintf @vsnprintf@ +#if (_MSC_VER > 1800) +#define tzname _tzname +#define P_tmpdir "C:\\TEMP" +#endif #if (_MSC_VER > 1310) # define HAVE_SETENV #define setenv(a,b,c) _putenv_s(a,b) @@ -529,7 +536,7 @@ /* We don't want the min/max macros */ #ifdef __WIN__ -#define NOMINMAX +#define NOMINMAX 1 #endif /* |