diff options
| author | Ajo Robert <ajo.robert@oracle.com> | 2016-01-07 14:36:19 +0530 |
|---|---|---|
| committer | Ajo Robert <ajo.robert@oracle.com> | 2016-01-07 14:36:19 +0530 |
| commit | 3d1306f7b74077cfa197c8fa23baeb96c535af67 (patch) | |
| tree | d6c2dae346f0cbafed48ff2a04093f0fa654a99b /config.h.cmake | |
| parent | 8c65e082f397a34cf393cfc6019daaa303ef5151 (diff) | |
| download | mariadb-git-3d1306f7b74077cfa197c8fa23baeb96c535af67.tar.gz | |
Bug#21770366 backport bug#21657078 to 5.5 and 5.6
Problem Statement
=========
Fix various issues when building MySQL with Visual Studio 2015.
Fix:
=======
- Visual Studio 2015 adds support for timespec. Add check and
related code to use this and only use our replacement if
timespec is not defined.
- Rename lfind/lsearch to my* to avoid redefinition problems.
- Set default value for TMPDIR to "" on Windows as P_tmpdir
no longer exists.
- using VS definition of snprintf if available
- tzname are now renamed to _tzname.
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index 8c93da072fb..4548d0a221f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -376,6 +376,7 @@ #cmakedefine HAVE_UINT64 1 #cmakedefine SIZEOF_BOOL @SIZEOF_BOOL@ #cmakedefine HAVE_BOOL 1 +#cmakedefine HAVE_STRUCT_TIMESPEC #cmakedefine SOCKET_SIZE_TYPE @SOCKET_SIZE_TYPE@ @@ -497,6 +498,7 @@ #cmakedefine strtok_r @strtok_r@ #cmakedefine strtoll @strtoll@ #cmakedefine strtoull @strtoull@ +#cmakedefine tzname @tzname@ #cmakedefine vsnprintf @vsnprintf@ #if (_MSC_VER > 1310) # define HAVE_SETENV |