From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 7 Sep 2021 13:39:53 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d09c3d5247e21f0a881406a020e6cdf87ab0ee2d;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable 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 d2f527a18..4972a6486 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -98,29 +98,6 @@
 #  error Unexpected: defined __arm64__ without __aarch64__
 #endif
 
-#ifdef GTEST
-
-// Select definitions based on product.
-#if defined(GTEST_PRODUCT_esx)
-#define vm_arm_64 0
-#define vm_x86_64 1
-
-#define VM_X86_64
-#define VM_X86_ANY
-#define VM_64BIT
-#elif defined(GTEST_PRODUCT_esxarm64)
-#define vm_arm_64 1
-#define vm_x86_64 0
-
-#define VM_ARM_64
-#define VM_ARM_ANY
-#define VM_64BIT
-#else
-#error "Unknown gtest product, cannot define ISA."
-#endif
-
-#else    // !GTEST
-
 /*
  * Setup a bunch of defines for instruction set architecture (ISA) related
  * properties.
@@ -169,8 +146,6 @@
 #define vm_arm_64 0
 #endif
 
-#endif   // !GTEST
-
 #ifdef VM_ARM_ANY
 #define vm_arm_any 1
 #else