From faea44cbc725afa9bf21281c55903f1429db72f4 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 29 Nov 2016 14:36:37 +0100 Subject: [PATCH] mingw-w64: Fix compiler warnings caused by macro redefinition GNU compiler report (cross build for Windows on Debian): In file included from ../ccutil/host.h:63:0, from ../arch/dotproductsse.h:22, from ../arch/dotproductsse.cpp:43: ../ccutil/platform.h:27:0: warning: "NOMINMAX" redefined #define NOMINMAX In file included from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/i686-w64-mingw32/bits/c++config.h:495:0, from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/cstdlib:41, from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/stdlib.h:36, from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/mm_malloc.h:27, from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/xmmintrin.h:34, from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/emmintrin.h:31, from ../arch/dotproductsse.cpp:40: /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/i686-w64-mingw32/bits/os_defines.h:45:0: note: this is the location of the previous definition #define NOMINMAX 1 Signed-off-by: Stefan Weil --- ccutil/platform.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ccutil/platform.h b/ccutil/platform.h index d60a45b601..dd9be87ac6 100644 --- a/ccutil/platform.h +++ b/ccutil/platform.h @@ -24,7 +24,9 @@ #define DLLSYM #ifdef _WIN32 +#ifndef NOMINMAX #define NOMINMAX +#endif /* NOMINMAX */ #define WIN32_LEAN_AND_MEAN #ifdef __GNUC__ #define ultoa _ultoa