Merge pull request #243 from takacsd:2.4

7bee55b8 · Andrey Kamaev · OpenCV Buildbot · 7c37f5d7 · 64f82190 · 7bee55b8
Commit 7bee55b8 authored Dec 20, 2012 by Andrey Kamaev Committed by OpenCV Buildbot Dec 20, 2012
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

operations.hpp modules/core/include/opencv2/core/operations.hpp +1 -1

No files found.
--- 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