Changed first approach to a more general MS-specific approach.

Suggested by @SpecLad

diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h
index 9bafb55..d542721 100644 (file)
--- a/modules/core/include/opencv2/core/types_c.h
+++ b/modules/core/include/opencv2/core/types_c.h
@@ -137,9 +137,8 @@
 #ifndef CV_INLINE
 #  if defined __cplusplus
 #    define CV_INLINE inline
-#  elif (defined WIN32 || defined _WIN32 || defined WINCE) && !defined __GNUC__
+#  elif defined _MSC_VER
 #    define CV_INLINE __inline
-#  elif (defined WIN32 || defined WIN32 || defined WINCE) && (!defined GNUC && !defined _CVI)
 #  else
 #    define CV_INLINE static
 #  endif