From: Viktor Szakats <commit@vsz.me>
Date: Thu, 9 Jan 2025 11:00:56 +0000 (+0100)
Subject: msvc: drop checks for `_MSC_VER >= 900`
X-Git-Tag: curl-8_12_0~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca18198dd4d6517bd2d8b34a99fcd9d4f780d219;p=thirdparty%2Fcurl.git

msvc: drop checks for `_MSC_VER >= 900`

It's Visual C++, 32-bit, version 2.0, released in 1993. Used to verify
if `_INTEGRAL_MAX_BITS` is available.

After this patch we assume `_INTEGRAL_MAX_BITS` is always available in
MSVC.

Closes #15952
---

diff --git a/include/curl/system.h b/include/curl/system.h
index d7203f23a5..682561a7e8 100644
--- a/include/curl/system.h
+++ b/include/curl/system.h
@@ -360,7 +360,7 @@
 #    define CURL_FORMAT_CURL_OFF_TU    PRIu64
 #    define CURL_SUFFIX_CURL_OFF_T     i64
 #    define CURL_SUFFIX_CURL_OFF_TU    ui64
-#  elif (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
+#  elif (_INTEGRAL_MAX_BITS >= 64)
 #    define CURL_TYPEOF_CURL_OFF_T     __int64
 #    define CURL_FORMAT_CURL_OFF_T     "I64d"
 #    define CURL_FORMAT_CURL_OFF_TU    "I64u"
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 1f280a96c6..4b599e5c8f 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -394,7 +394,7 @@ Vista
 /* ---------------------------------------------------------------- */
 
 #if defined(_MSC_VER) && !defined(_WIN32_WCE)
-#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
+#  if (_INTEGRAL_MAX_BITS >= 64)
 #    define USE_WIN32_LARGE_FILES
 #  else
 #    define USE_WIN32_SMALL_FILES
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 1e6fce642a..cd42c37288 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -239,7 +239,7 @@
 /* ---------------------------------------------------------------- */
 
 #if defined(_MSC_VER) && !defined(_WIN32_WCE)
-#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
+#  if (_INTEGRAL_MAX_BITS >= 64)
 #    define USE_WIN32_LARGE_FILES
 #  else
 #    define USE_WIN32_SMALL_FILES
diff --git a/lib/mprintf.c b/lib/mprintf.c
index e04a0e99e4..396c78625c 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -37,14 +37,12 @@
 #ifdef HAVE_LONGLONG
 #  define LONG_LONG_TYPE long long
 #  define HAVE_LONG_LONG_TYPE
+#elif defined(_MSC_VER) && (_INTEGRAL_MAX_BITS >= 64)
+#  define LONG_LONG_TYPE __int64
+#  define HAVE_LONG_LONG_TYPE
 #else
-#  if defined(_MSC_VER) && (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
-#    define LONG_LONG_TYPE __int64
-#    define HAVE_LONG_LONG_TYPE
-#  else
-#    undef LONG_LONG_TYPE
-#    undef HAVE_LONG_LONG_TYPE
-#  endif
+#  undef LONG_LONG_TYPE
+#  undef HAVE_LONG_LONG_TYPE
 #endif
 
 /*