From f9b594bf0899a78065393eebac162c4e17e40438 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Thu, 18 Jul 2013 14:24:19 +0200 Subject: [PATCH] Changed first approach to a more general MS-specific approach. Suggested by @SpecLad --- modules/core/include/opencv2/core/types_c.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h index 9bafb5580f..d542721dfd 100644 --- 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