From fe61845ac58340f801816e9dad09b547b24f1378 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sun, 17 Nov 2024 11:45:41 -0500 Subject: [PATCH] COMP: itktiff: Suppress C99 inline only on MSVC from VS 2013 and below Extend the condition from commit 08bf6bec432 (COMP: Conditionalize insane "#define inline" in libtiff, 2013-10-07, v4.5rc01~139^2). Newer MSVC versions need it to avoid duplicating `__ucrt_int_to_float`. Issue: #4820 --- Modules/ThirdParty/TIFF/src/itktiff/libtiff/tif_config.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/ThirdParty/TIFF/src/itktiff/libtiff/tif_config.h.in b/Modules/ThirdParty/TIFF/src/itktiff/libtiff/tif_config.h.in index ce70dc76263..19d30b5b2ec 100644 --- a/Modules/ThirdParty/TIFF/src/itktiff/libtiff/tif_config.h.in +++ b/Modules/ThirdParty/TIFF/src/itktiff/libtiff/tif_config.h.in @@ -420,7 +420,7 @@ the sizes can be different.*/ /* MSVC does not support C99 inline, so just make the inline keyword disappear for C. */ #ifndef __cplusplus -# ifdef _MSC_VER +# if defined(_MSC_VER) && _MSC_VER < 1900 # define inline # endif #endif