Merge branch 'release-5.4' into release

Kitware · Nov 21, 2024 · b1b9bfd · b1b9bfd
2 parents 2cd34b7 + 49413c3
commit b1b9bfd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Modules/ThirdParty/TIFF/src/itktiff/tif_config.h.in b/Modules/ThirdParty/TIFF/src/itktiff/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