From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 4 Mar 2021 21:48:46 +0000 (-0800)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44bfc5bc266ae7fc9c8c3df551220942c187c587;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 674940f02..4972a6486 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -564,8 +564,9 @@ typedef  int128  Reg128;
 typedef uint128 UReg128;
 #endif
 
-#if defined(VMM) || defined(COREQUERY) || defined(EXTDECODER) ||  \
-    defined (VMKERNEL) || defined (VMKBOOT) || defined (ULM)
+#if (defined(VMM) || defined(COREQUERY) || defined(EXTDECODER) ||  \
+     defined (VMKERNEL) || defined (VMKBOOT) || defined (ULM)) &&  \
+    !defined (FROBOS)
 typedef  Reg64  Reg;
 typedef UReg64 UReg;
 #endif