From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 10 Apr 2019 21:14:55 +0000 (-0700)
Subject: Changes to common header files not applilcable to open-vm-tools.
X-Git-Tag: stable-11.0.0~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bc7907533c45544fcfb24906a0e4b7de61718e7;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files not applilcable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/includeCheck.h b/open-vm-tools/lib/include/includeCheck.h
index bf0819432..4dc5537f5 100644
--- a/open-vm-tools/lib/include/includeCheck.h
+++ b/open-vm-tools/lib/include/includeCheck.h
@@ -100,7 +100,7 @@
 #undef INCLUDE_ALLOW_VMX
 
 #if defined USERLEVEL && !defined VMX86_VMX && !defined VMCORE && \
-    !defined ULVMM && !defined INCLUDE_ALLOW_USERLEVEL && \
+    !defined ULM && !defined INCLUDE_ALLOW_USERLEVEL && \
     !defined INCLUDE_ALLOW_MKS
 #error "The surrounding include file is not allowed at userlevel."
 #endif
diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index cd3189fd9..cea886074 100644
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -703,7 +703,7 @@ typedef int pid_t;
 #define VMM_ONLY(x)
 #endif
 
-#ifdef ULVMM
+#ifdef ULM
 #define vmx86_ulm 1
 #define ULM_ONLY(x) x
 #else
@@ -711,7 +711,7 @@ typedef int pid_t;
 #define ULM_ONLY(x)
 #endif
 
-#if defined(VMM) || defined(ULVMM)
+#if defined(VMM) || defined(ULM)
 #define MONITOR_ONLY(x) x
 #else
 #define MONITOR_ONLY(x)
diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 1ebdbe687..09019f551 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -535,7 +535,7 @@ typedef uint128 UReg128;
 #endif
 
 #if defined(VMM) || defined(COREQUERY) || defined(EXTDECODER) ||  \
-    defined (VMKERNEL) || defined (VMKBOOT) || defined (ULVMM)
+    defined (VMKERNEL) || defined (VMKBOOT) || defined (ULM)
 typedef  Reg64  Reg;
 typedef UReg64 UReg;
 #endif