From: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue, 12 Sep 2023 20:34:31 +0000 (+0300)
Subject: MSVC: #define inline and restrict only when needed.
X-Git-Tag: v5.5.1alpha~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c2d197c940d246849b2ec48109bb22e54036927;p=thirdparty%2Fxz.git

MSVC: #define inline and restrict only when needed.

This also drops the check for _WIN32 as that shouldn't be needed.
---

diff --git a/src/common/sysdefs.h b/src/common/sysdefs.h
index 97be4ee3..07502dc9 100644
--- a/src/common/sysdefs.h
+++ b/src/common/sysdefs.h
@@ -151,13 +151,16 @@ typedef unsigned char _Bool;
 
 #include <string.h>
 
-// As of MSVC 2013, inline and restrict are supported with
-// non-standard keywords.
-#if defined(_WIN32) && defined(_MSC_VER)
-#	ifndef inline
+// Visual Studio 2013 update 2 supports only __inline, not inline.
+// MSVC v19.0 / VS 2015 and newer support both.
+//
+// MSVC v19.27 (VS 2019 version 16.7) added support for restrict.
+// Older ones support only __restrict.
+#ifdef _MSC_VER
+#	if _MSC_VER < 1900 && !defined(inline)
 #		define inline __inline
 #	endif
-#	ifndef restrict
+#	if _MSC_VER < 1927 && !defined(restrict)
 #		define restrict __restrict
 #	endif
 #endif