From 08bf6bec432a5cd9ce5fc827cdc51e0ca9526b3e Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 7 Oct 2013 17:26:23 +0000 Subject: [PATCH] COMP: Conditionalize insane "#define inline" in libtiff This was causing mysterious linker errors if building against the OS X 10.9 SDK. Limit it to MS compiler, which does not support 'inline' in C. Suggested-by: Sean McBride http://review.source.kitware.com/#/c/12924/3 Change-Id: Ic72f744d0b9b68412d65792ca1430a9151d7080a --- Modules/ThirdParty/TIFF/src/itktiff/tif_config.h.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/ThirdParty/TIFF/src/itktiff/tif_config.h.in b/Modules/ThirdParty/TIFF/src/itktiff/tif_config.h.in index 5d5e3504241..8c7260a53f5 100644 --- a/Modules/ThirdParty/TIFF/src/itktiff/tif_config.h.in +++ b/Modules/ThirdParty/TIFF/src/itktiff/tif_config.h.in @@ -455,11 +455,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 int' if does not define. */