From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 26 Mar 2021 03:21:18 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d26c6dfb4cf8dd0783df79589b3621f87c71071e;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index a840368f4..f086dc49e 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -544,20 +544,15 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_TENSERVER_2019_GENERIC_FULL "Windows Server 2019"
 #define STR_OS_WIN_TENSERVER_2022_GENERIC_FULL "Windows Server 2022"
 
-/* Win 10 server versions are distinguished by major build number */
-#define WIN10SERVER2016_BUILD14393 14393
-#define WIN10SERVER2019_BUILD17763 17763
-#define WIN10SERVER2022_BUILDxxxxx "TBD"
-
 /* Microsoft Hyper-V */
 #define STR_OS_HYPER_V      "winHyperV"
 #define STR_OS_HYPER_V_FULL "Hyper-V Server"
 
 /* Windows Future/Unknown */
 
-#define STR_OS_WIN_FUTURE                   "windowsUnknown"
-#define STR_OS_WIN_FUTURE_X64               "windowsUnknown-64"
-#define STR_OS_WIN_FUTURE_GENERIC           "Windows Unknown"
+#define STR_OS_WIN_UNKNOWN                   "windowsUnknown"
+#define STR_OS_WIN_UNKNOWN_X64               "windowsUnknown-64"
+#define STR_OS_WIN_UNKNOWN_GENERIC           "Windows Unknown"
 
 /* Modifiers for Windows Vista, Windows Server 2008, and later. */
 #define STR_OS_WIN_32_BIT_EXTENSION ", 32-bit"