From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:52 +0000 (-0700)
Subject: Fix vm_basic_types.h broken in previous commit.
X-Git-Tag: stable-10.2.0~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a74858200ae2fb5908b74676da56124d83a8285;p=thirdparty%2Fopen-vm-tools.git

Fix vm_basic_types.h broken in previous commit.
---

diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 13a1f875f..69d312fd8 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -143,10 +143,8 @@ typedef char           Bool;
 #define VM_I386
 #define VM_X86_ANY
 #define VM_64BIT
-#define vm_64bit 1
 #else
 #define vm_x86_64 0
-#define vm_64bit 0
 #endif
 
 #ifdef __arm__
@@ -160,12 +158,12 @@ typedef char           Bool;
 #define vm_arm_64 1
 #define VM_ARM_ANY
 #define VM_64BIT
-#define vm_64bit 1
 #else
 #define vm_arm_64 0
-#define vm_64bit 0
 #endif
 
+#define vm_64bit (sizeof (void *) == 8)
+
 #ifdef _MSC_VER
 
 #pragma warning (3 :4505) // unreferenced local function