From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:52 +0000 (-0700)
Subject: Change to shared header file unrelated to open-vm-tools.
X-Git-Tag: stable-10.2.0~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cc7edaf4294f47d6210af45c1ba64d967a031a2;p=thirdparty%2Fopen-vm-tools.git

Change to shared header file unrelated to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index ef86ff129..13a1f875f 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -126,7 +126,8 @@ typedef char           Bool;
  */
 
 #ifdef __i386__
-/* VM_I386 is historically synonymous with VM_X86_ANY in bora, but misleading,
+/*
+ * VM_I386 is historically synonymous with VM_X86_ANY in bora, but misleading,
  * since it is confused with the __i386__ gcc but defined for both 32- and
  * 64-bit x86. We retain it here for legacy compatibility.
  */
@@ -138,12 +139,14 @@ typedef char           Bool;
 
 #ifdef __x86_64__
 #define VM_X86_64
+#define vm_x86_64 1
 #define VM_I386
 #define VM_X86_ANY
 #define VM_64BIT
-#define vm_x86_64 (1)
+#define vm_64bit 1
 #else
-#define vm_x86_64 (0)
+#define vm_x86_64 0
+#define vm_64bit 0
 #endif
 
 #ifdef __arm__
@@ -154,11 +157,13 @@ typedef char           Bool;
 
 #ifdef __aarch64__
 #define VM_ARM_64
+#define vm_arm_64 1
 #define VM_ARM_ANY
 #define VM_64BIT
-#define vm_arm_64 (1)
+#define vm_64bit 1
 #else
-#define vm_arm_64 (0)
+#define vm_arm_64 0
+#define vm_64bit 0
 #endif
 
 #ifdef _MSC_VER