diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2015-11-06 17:24:23 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2015-11-06 17:27:24 +0100 |
| commit | f1daf9ced46ba65b025a92f512833c86d04e7cf2 (patch) | |
| tree | d8c63373681dde1e5db37d76019df110eb75b4cf /config.h.cmake | |
| parent | a36048d143c2e3cd956009849dc28f4a714d00d0 (diff) | |
| download | mariadb-git-f1daf9ced46ba65b025a92f512833c86d04e7cf2.tar.gz | |
MDEV-9024 Build fails with VS2015
Fix build failures caused by new C runtime library
- isnan, snprintf, struct timespec are now defined, attempt to
redefine them leads
- P_tmpdir, tzname are no more defined
- lfind() and lsearch() in lf_hash.c had to be renamed, declaration
conflicts with some C runtime functions with the same name declared in
a header included by stdlib.h
Also fix couple of annoying warnings :
- remove #define NOMINMAX from config.h to avoid "redefined" compiler
warnings(NOMINMAX is already in compile flags)
- disable incremental linker in Debug as well (feature not used much
and compiler crashes often)
Also simplify package building with Wix, require Wix 3.9 or later
(VS2015 is not compatible with old Wix 3.5/3.6)
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index 46eed79dfa5..b037464df88 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -317,6 +317,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 @@ -514,6 +516,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) @@ -522,7 +528,7 @@ /* We don't want the min/max macros */ #ifdef __WIN__ -#define NOMINMAX +#define NOMINMAX 1 #endif /* |