Upstream: http://review.source.kitware.com/#/c/12924/ X-Git-Url: http://review.source.kitware.com/gitweb?p=VTK.git;a=blobdiff_plain;f=ThirdParty%2Ftiff%2Fvtktiff%2Ftif_config.h.in;h=cc9706284f14b3ca7941c22eb5df8fc5588c590a;hp=55ff16a21756dd896891f7b08ec47af664d0cafa;hb=b9658e5decdbe36b11a8947fb9ba802b92bac8b4;hpb=c9c2370684b44545d9f7d49de99510e50b0118f6 diff --git a/ThirdParty/tiff/vtktiff/tif_config.h.in b/ThirdParty/tiff/vtktiff/tif_config.h.in index 55ff16a..cc97062 100644 --- Utilities/vtktiff/tif_config.h.in +++ Utilities/vtktiff/tif_config.h.in @@ -238,11 +238,12 @@ the sizes can be different.*/ /* Define to empty if `const' does not conform to ANSI C. */ #cmakedefine const -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ +/* MSVC does not support C99 inline, so just make the inline keyword + disappear for C. */ #ifndef __cplusplus -#define inline -//#cmakedefine inline +# ifdef _MSC_VER +# define inline +# endif #endif /* Define to `long' if <sys/types.h> does not define. */