fixup! Some changes to support mingw-w64

8c65f8a0 · Maksim Shabunin · e009d79c · 8c65f8a0
Commit 8c65f8a0 authored Sep 01, 2015 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/modules/core/include/opencv2/core/base.hpp
+++ b/modules/core/include/opencv2/core/base.hpp
@@ -271,7 +271,7 @@ enum BorderTypes {
 #  endif
 #endif
 #ifndef CV_StaticAssert
-#  if defined(__GNUC__) && (__GNUC__*100 + __GNUC_MINOR__ > 302)
+#  if !defined(__clang__) && defined(__GNUC__) && (__GNUC__*100 + __GNUC_MINOR__ > 302)
 #    define CV_StaticAssert(condition, reason) ({ extern int __attribute__((error("CV_StaticAssert: " reason " " #condition))) CV_StaticAssert(); ((condition) ? 0 : CV_StaticAssert()); })
 #  else
     template <bool x> struct CV_StaticAssert_failed;