mirror of
https://github.com/opencv/opencv.git
synced 2025-01-18 06:03:15 +08:00
Merge pull request #1148 from StevenPuttemans:patch_3125
This commit is contained in:
commit
1c35f121bb
@ -137,7 +137,7 @@
|
|||||||
#ifndef CV_INLINE
|
#ifndef CV_INLINE
|
||||||
# if defined __cplusplus
|
# if defined __cplusplus
|
||||||
# define CV_INLINE inline
|
# define CV_INLINE inline
|
||||||
# elif (defined WIN32 || defined _WIN32 || defined WINCE) && !defined __GNUC__
|
# elif defined _MSC_VER
|
||||||
# define CV_INLINE __inline
|
# define CV_INLINE __inline
|
||||||
# else
|
# else
|
||||||
# define CV_INLINE static
|
# define CV_INLINE static
|
||||||
|
Loading…
Reference in New Issue
Block a user