From 1fc89bb2e02b7f3c92dbdba56dce20ca84594a52 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Wed, 17 Jul 2013 13:20:25 +0200 Subject: [PATCH] Added the solution mentioned in patch #3125 --- modules/core/include/opencv2/core/types_c.h | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h index 8db2fe7..9bafb55 100644 --- a/modules/core/include/opencv2/core/types_c.h +++ b/modules/core/include/opencv2/core/types_c.h @@ -139,6 +139,7 @@ # define CV_INLINE inline # elif (defined WIN32 || defined _WIN32 || defined WINCE) && !defined __GNUC__ # define CV_INLINE __inline +# elif (defined WIN32 || defined WIN32 || defined WINCE) && (!defined GNUC && !defined _CVI) # else # define CV_INLINE static # endif -- 2.7.4