summaryrefslogtreecommitdiff
path: root/mysys/hash.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2015-11-06 17:24:23 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2015-11-06 17:27:24 +0100
commitf1daf9ced46ba65b025a92f512833c86d04e7cf2 (patch)
treed8c63373681dde1e5db37d76019df110eb75b4cf /mysys/hash.c
parenta36048d143c2e3cd956009849dc28f4a714d00d0 (diff)
downloadmariadb-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 'mysys/hash.c')
-rw-r--r--mysys/hash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/hash.c b/mysys/hash.c
index 4ef731cde15..344b698a433 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -40,7 +40,7 @@ static void movelink(HASH_LINK *array,uint pos,uint next_link,uint newlink);
static int hashcmp(const HASH *hash, HASH_LINK *pos, const uchar *key,
size_t length);
-my_hash_value_type my_hash_sort(const CHARSET_INFO *cs, const uchar *key,
+my_hash_value_type my_hash_sort(CHARSET_INFO *cs, const uchar *key,
size_t length)
{
ulong nr1= 1, nr2= 4;