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 00537532c7af2d96d64e26945cc8f481b3149c8d..5825cfa856c5a027c0e4b545a2f4dd0e3b0802db 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -327,7 +327,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_OTHER_LINUX_FULL   "Other Linux"
 #define STR_OS_OTHER              "other"
 #define STR_OS_OTHER_FULL         "Other OSes"
-#define STR_OS_ARM_OTHER_FULL     "Other OSes Arm"
 #define STR_OS_OTHER_LINUX        "otherlinux"
 #define STR_OS_OTHER_LINUXFULL    "Other Linux"
 #define STR_OS_OTHER_24           "other24xlinux"
@@ -342,8 +341,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_OTHER_5X_FULL      "Other Linux 5.x kernel"
 #define STR_OS_OTHER_6X           "other6xlinux"
 #define STR_OS_OTHER_6X_FULL      "Other Linux 6.x and later kernel"
-#define STR_OS_ARM_OTHER_5X_FULL  "Other Linux 5.x kernel Arm"
-#define STR_OS_ARM_OTHER_6X_FULL  "Other Linux 6.x and later kernel Arm"
 #define STR_OS_PHOTON             "vmware-photon"
 #define STR_OS_PHOTON_FULL        "VMware Photon OS"
 #define STR_OS_PLD                "PLD"
@@ -399,14 +396,14 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_NET_ST               "winNetStandard"
 #define STR_OS_WIN_NET_ST_FULL          "Windows Server 2003 Standard Edition"
 #define STR_OS_WIN_NET_EN               "winNetEnterprise"
-#define STR_OS_WIN_NET_EN_FULL         "Windows Server 2003 Enterprise Edition"
+#define STR_OS_WIN_NET_EN_FULL          "Windows Server 2003 Enterprise Edition"
 #define STR_OS_WIN_NET_BUS              "winNetBusiness"
 #define STR_OS_WIN_NET_BUS_FULL         "Windows Server 2003 Small Business"
 #define STR_OS_WIN_NET_COMPCLUSTER      "winNetComputeCluster"
 #define STR_OS_WIN_NET_COMPCLUSTER_FULL "Windows Server 2003 Compute Cluster Edition"
 #define STR_OS_WIN_NET_STORAGESERVER    "winNetStorageSvr"
 #define STR_OS_WIN_NET_STORAGESERVER_FULL "Windows Storage Server 2003"
-#define STR_OS_WIN_NET_DC_FULL         "Windows Server 2003 Datacenter Edition"
+#define STR_OS_WIN_NET_DC_FULL          "Windows Server 2003 Datacenter Edition"
 #define STR_OS_WIN_NET_DC               "winNetDatacenter"
 #define STR_OS_WIN_LONG                 "longhorn"
 #define STR_OS_WIN_VISTA                "winVista"
@@ -426,7 +423,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_VISTA_STARTER        "winVistaStarter-32"
 #define STR_OS_WIN_VISTA_STARTER_FULL   "Windows Vista Starter Edition"
 #define STR_OS_WIN_2008_CLUSTER         "winServer2008Cluster-32"
-#define STR_OS_WIN_2008_CLUSTER_FULL "Windows Server 2008 Cluster Server Edition"
+#define STR_OS_WIN_2008_CLUSTER_FULL    "Windows Server 2008 Cluster Server Edition"
 #define STR_OS_WIN_2008_DATACENTER      "winServer2008Datacenter-32"
 #define STR_OS_WIN_2008_DATACENTER_FULL "Windows Server 2008 Datacenter Edition"
 #define STR_OS_WIN_2008_DATACENTER_CORE "winServer2008DatacenterCore-32"
@@ -445,24 +442,24 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_2008_MEDIUM_SECURITY_FULL "Windows Essential Business Server Security Server"
 #define STR_OS_WIN_2008_SERVER_FOR_SMALLBUSINESS "winServer2008ForSmallBusiness-32"
 #define STR_OS_WIN_2008_SERVER_FOR_SMALLBUSINESS_FULL "Windows Server 2008 for Windows Essential Server Solutions"
-#define STR_OS_WIN_2008_SMALL_BUSINESS "winServer2008SmallBusiness-32"
+#define STR_OS_WIN_2008_SMALL_BUSINESS  "winServer2008SmallBusiness-32"
 #define STR_OS_WIN_2008_SMALL_BUSINESS_FULL "Windows Server 2008 Small Business Server"
 #define STR_OS_WIN_2008_SMALL_BUSINESS_PREMIUM "winServer2008SmallBusinessPremium-32"
 #define STR_OS_WIN_2008_SMALL_BUSINESS_PREMIUM_FULL "Windows Server 2008 Small Business Server Premium Edition"
-#define STR_OS_WIN_2008_STANDARD "winServer2008Standard-32"
-#define STR_OS_WIN_2008_STANDARD_FULL "Windows Server 2008 Standard Edition"
-#define STR_OS_WIN_2008_STANDARD_CORE "winServer2008StandardCore-32"
+#define STR_OS_WIN_2008_STANDARD        "winServer2008Standard-32"
+#define STR_OS_WIN_2008_STANDARD_FULL   "Windows Server 2008 Standard Edition"
+#define STR_OS_WIN_2008_STANDARD_CORE   "winServer2008StandardCore-32"
 #define STR_OS_WIN_2008_STANDARD_CORE_FULL "Windows Server 2008 Standard Edition (core installation)"
 #define STR_OS_WIN_2008_STORAGE_ENTERPRISE "winServer2008StorageEnterprise-32"
 #define STR_OS_WIN_2008_STORAGE_ENTERPRISE_FULL "Windows Server 2008 Storage Server Enterprise"
-#define STR_OS_WIN_2008_STORAGE_EXPRESS "winServer2008StorageExpress-32"
+#define STR_OS_WIN_2008_STORAGE_EXPRESS  "winServer2008StorageExpress-32"
 #define STR_OS_WIN_2008_STORAGE_EXPRESS_FULL "Windows Server 2008 Storage Server Express"
 #define STR_OS_WIN_2008_STORAGE_STANDARD "winServer2008StorageStandard-32"
 #define STR_OS_WIN_2008_STORAGE_STANDARD_FULL "Windows Server 2008 Storage Server Standard"
 #define STR_OS_WIN_2008_STORAGE_WORKGROUP "winServer2008StorageWorkgroup-32"
 #define STR_OS_WIN_2008_STORAGE_WORKGROUP_FULL "Windows Server 2008 Storage Server Workgroup"
-#define STR_OS_WIN_2008_WEB_SERVER "winServer2008Web-32"
-#define STR_OS_WIN_2008_WEB_SERVER_FULL "Windows Server 2008 Web Server Edition"
+#define STR_OS_WIN_2008_WEB_SERVER       "winServer2008Web-32"
+#define STR_OS_WIN_2008_WEB_SERVER_FULL  "Windows Server 2008 Web Server Edition"
 
 /* Windows 64-bit */
 #define STR_OS_WIN_VISTA_ULTIMATE_X64         "winVistaUltimate-64"
@@ -471,12 +468,12 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_VISTA_ENTERPRISE_X64       "winVistaEnterprise-64"
 #define STR_OS_WIN_VISTA_BUSINESS_X64         "winVistaBusiness-64"
 #define STR_OS_WIN_VISTA_STARTER_X64          "winVistaStarter-64"
+
 #define STR_OS_WIN_2008_CLUSTER_X64           "winServer2008Cluster-64"
 #define STR_OS_WIN_2008_DATACENTER_X64        "winServer2008Datacenter-64"
 #define STR_OS_WIN_2008_DATACENTER_CORE_X64   "winServer2008DatacenterCore-64"
 #define STR_OS_WIN_2008_ENTERPRISE_X64        "winServer2008Enterprise-64"
 #define STR_OS_WIN_2008_ENTERPRISE_CORE_X64   "winServer2008EnterpriseCore-64"
-#define STR_OS_WIN_2008_ENTERPRISE_ITANIUM_X64 "winServer2008EnterpriseItanium-64"
 #define STR_OS_WIN_2008_MEDIUM_MANAGEMENT_X64 "winServer2008MediumManagement-64"
 #define STR_OS_WIN_2008_MEDIUM_MESSAGING_X64  "winServer2008MediumMessaging-64"
 #define STR_OS_WIN_2008_MEDIUM_SECURITY_X64   "winServer2008MediumSecurity-64"