From 64f821908e41f44f9b8f50478942cd55b44bb2d7 Mon Sep 17 00:00:00 2001 From: takacsd Date: Thu, 20 Dec 2012 11:28:16 +0100 Subject: [PATCH] Add missing _WIN32 check in core/operations.hpp. Fix a compilation error with MinGW gcc 4.7 with enabled C++11 support (-std=c++11). Issue number: #2555 --- modules/core/include/opencv2/core/operations.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp index e3ebe6e..a903174 100644 --- a/modules/core/include/opencv2/core/operations.hpp +++ b/modules/core/include/opencv2/core/operations.hpp @@ -64,7 +64,7 @@ #endif #elif __GNUC__*10 + __GNUC_MINOR__ >= 42 - #if !defined WIN32 && (defined __i486__ || defined __i586__ || \ + #if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined __i586__ || \ defined __i686__ || defined __MMX__ || defined __SSE__ || defined __ppc__) #define CV_XADD __sync_fetch_and_add #else -- 2.7.4