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

Suggested by @SpecLad

Changed first approach to a more general MS-specific approach.
Suggested by @SpecLad
f9b594bf · StevenPuttemans · 1fc89bb2 · f9b594bf
Commit f9b594bf authored Jul 18, 2013 by StevenPuttemans
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

types_c.h modules/core/include/opencv2/core/types_c.h +1 -2

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