From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Tue, 24 Jun 2025 16:26:22 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-13.1.0~155
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=8fd79ccb15d30d5c5fa8e1da2db0eb22c6bb3ff1;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/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index b1ff8b7e3..5de1b6a51 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -290,10 +290,12 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLOS2                BS(OS2), ALLECOMSTATION
 
-#define ALLCRX                BS(CRXSYS1_64),     BS(CRXPOD1_64),     \
-                              BS(CRXSYS1_ARM_64), BS(CRXPOD1_ARM_64), \
+#define ALLCRXSYS             BS(CRXSYS1_64),     BS(CRXSYS1_ARM_64), \
                               BS(CRXSYS2_64),     BS(CRXSYS2_ARM_64)
 
+#define ALLCRX                ALLCRXSYS,                              \
+                              BS(CRXPOD1_64),     BS(CRXPOD1_ARM_64)
+
 #define ALLARM                BS(WIN_10_ARM_64),        BS(WIN_11_ARM_64),       \
                               BS(WIN_12_ARM_64),                                 \
                               BS(UBUNTU_ARM_64),        BS(PHOTON_ARM_64),       \
@@ -320,7 +322,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_VMKERNEL            "vmkernel"
 
 /* Linux */
-#define	STR_OS_ALMA_LINUX          "almaLinux"
+#define STR_OS_ALMA_LINUX          "almaLinux"
 #define STR_OS_AMAZON_LINUX        "amazonlinux"
 #define STR_OS_ANNVIX              "Annvix"
 #define STR_OS_ARCH                "Arch"