From 49b55a7245a5452e836aee76cf4237f0d90f97ee Mon Sep 17 00:00:00 2001
From: Sam Bromley <sam@sambromley.com>
Date: Thu, 26 Jul 2012 12:35:21 -0230
Subject: [PATCH] Protect check for _MSC_VER with #if defined.

---
 modules/core/include/opencv2/core/internal.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/core/include/opencv2/core/internal.hpp b/modules/core/include/opencv2/core/internal.hpp
index 369921aff5..2fe56cd7d9 100644
--- a/modules/core/include/opencv2/core/internal.hpp
+++ b/modules/core/include/opencv2/core/internal.hpp
@@ -120,15 +120,15 @@ CV_INLINE IppiSize ippiSize(int width, int height)
 #  else
 #    define CV_SSSE3 0
 #  endif
-#  if defined __SSE4_1__ || _MSC_VER >= 1600
+#  if defined __SSE4_1__ || (defined _MSC_VER && _MSC_VER >= 1600)
 #	 include <smmintrin.h>
 #	 define CV_SSE4_1 1
 #  endif
-#  if defined __SSE4_2__ || _MSC_VER >= 1600
+#  if defined __SSE4_2__ || (defined _MSC_VER && _MSC_VER >= 1600)
 #	 include <nmmintrin.h>
 #    define CV_SSE4_2 1
 #  endif
-#  if defined __AVX__ || _MSC_VER >= 1600
+#  if defined __AVX__ || (defined _MSC_VER && _MSC_VER >= 1600)
 #	 include <immintrin.h>
 #    define CV_AVX 1
 #  endif
@@ -779,4 +779,4 @@ CV_EXPORTS bool icvCheckGlError(const char* file, const int line, const char* fu
 
 #endif //__cplusplus
 
-#endif // __OPENCV_CORE_INTERNAL_HPP__
\ No newline at end of file
+#endif // __OPENCV_CORE_INTERNAL_HPP__
-- 
GitLab