From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Wed, 8 Jan 2025 06:05:49 +0000 (-0800)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-13.0.0~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d64a254d1fd8df7c53e7bb65dee3c987fdaee87;p=thirdparty%2Fopen-vm-tools.git

Change to common header file not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 03620f599..d7933515a 100644
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -633,8 +633,10 @@ typedef int pid_t;
 /*
  * Old MSVC versions (such as MSVC 14.29.30133, used to build Workstation's
  * offset checker) are notorious to have non-standard __VA_ARGS__ handling.
+ * The current latest Visual Studio 2022 17.10 (MSVC 19.40/_MSC_VER 1940)
+ * has not fixed the defect yet.
  */
-#if defined(VMX86_DESKTOP) && (_MSC_VER > 1929)
+#if defined(VMX86_DESKTOP) && (_MSC_VER > 1940)
 #pragma message("ERROR: Compiler version: " XSTR(_MSC_VER))
 #pragma message("ERROR: PR 3405101: Is __VA_ARGS__ hack needed for Arm & x86?")
 #endif
@@ -656,8 +658,10 @@ typedef int pid_t;
 /*
  * Old MSVC versions (such as MSVC 14.29.30133, used to build Workstation's
  * offset checker) are notorious to have non-standard __VA_ARGS__ handling.
+ * The current latest Visual Studio 2022 17.10 (MSVC 19.40/_MSC_VER 1940)
+ * has not fixed the defect yet.
  */
-#if defined(VMX86_DESKTOP) && (_MSC_VER > 1929)
+#if defined(VMX86_DESKTOP) && (_MSC_VER > 1940)
 #pragma message("ERROR: Compiler version: " XSTR(_MSC_VER))
 #pragma message("ERROR: PR 3405101: Is __VA_ARGS__ hack needed for Arm & x86?")
 #endif