From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 27 Jul 2021 17:37:24 +0000 (-0700)
Subject: guest_os.h: A bit of clean up
X-Git-Tag: stable-12.0.0~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a599078d238c12c26d3ca3e39c743f7d9c65555;p=thirdparty%2Fopen-vm-tools.git

guest_os.h: A bit of clean up

Arrange things in a nicer way.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 2c82de118..6595e074e 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -88,10 +88,10 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(FREEBSD12),  BS(FREEBSD13),  \
                               BS(FREEBSD14)
 
-#define ALLFREEBSD64          BS(FREEBSD_64),   BS(FREEBSD11_64),     \
-                              BS(FREEBSD12_64), BS(FREEBSD13_64),     \
-                              BS(FREEBSD14_64), BS(FREEBSD13_ARM_64), \
-                              BS(FREEBSD14_ARM_64)
+#define ALLFREEBSD64          BS(FREEBSD_64),                           \
+                              BS(FREEBSD11_64),  BS(FREEBSD12_64),      \
+                              BS(FREEBSD13_64),  BS(FREEBSD13_ARM_64),  \
+                              BS(FREEBSD14_64),  BS(FREEBSD14_ARM_64)
 
 #define ALLFREEBSD            ALLFREEBSD32, ALLFREEBSD64
 
@@ -182,9 +182,9 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(SOLARIS10), BS(SOLARIS10_64), \
                               ALLSOLARIS11_OR_HIGHER
 
-#define ALLSOLARIS            BS(SOLARIS_6_AND_7), \
-                              BS(SOLARIS8), \
-                              BS(SOLARIS9), \
+#define ALLSOLARIS            BS(SOLARIS_6_AND_7),    \
+                              BS(SOLARIS8),           \
+                              BS(SOLARIS9),           \
                               ALLSOLARIS10_OR_HIGHER
 
 #define ALLNETWARE            BS(NETWARE4), BS(NETWARE5), BS(NETWARE6)
@@ -263,11 +263,11 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLCRX                BS(CRXSYS1_64), BS(CRXPOD1_64)
 
-#define ALLARM                BS(WIN_10_ARM_64),    BS(UBUNTU_ARM_64),       \
-                              BS(PHOTON_ARM_64),    BS(VMKERNEL7_ARM),       \
-                              BS(OTHER_ARM_64),     BS(OTHER5XLINUX_ARM_64), \
-                              BS(DEBIAN_ARM_64),    BS(FREEBSD13_ARM_64),    \
-                              BS(FREEBSD14_ARM_64), BS(WIN_11_ARM_64)
+#define ALLARM                BS(WIN_10_ARM_64),        BS(WIN_11_ARM_64),   \
+                              BS(UBUNTU_ARM_64),        BS(PHOTON_ARM_64),   \
+                              BS(VMKERNEL7_ARM),        BS(OTHER_ARM_64),    \
+                              BS(OTHER5XLINUX_ARM_64),  BS(DEBIAN_ARM_64),   \
+                              BS(FREEBSD13_ARM_64),     BS(FREEBSD14_ARM_64)
 
 /*
  * These constants are generated by GuestInfoGetOSName which is in