From f1daf9ced46ba65b025a92f512833c86d04e7cf2 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 6 Nov 2015 17:24:23 +0100 Subject: 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) --- client/mysql.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/mysql.cc') diff --git a/client/mysql.cc b/client/mysql.cc index 60bed6b0d6a..71eac780262 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1108,7 +1108,7 @@ inline int get_command_index(char cmd_char) All client-specific commands are in the first part of commands array and have a function to implement it. */ - for (uint i= 0; *commands[i].func; i++) + for (uint i= 0; commands[i].func; i++) if (commands[i].cmd_char == cmd_char) return i; return -1; -- cgit v1.2.1