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 bf0819432414e5866a7657d4f47e4a7abb54379d..4dc5537f5eb2f5b113a2da64ff98c4ae646ee2ec 100644 (file)
--- 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 cd3189fd9a36cd01d860283322083624d81b1d67..cea88607477b5ce09ec4d973bdb2471736450c09 100644 (file)
--- 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 1ebdbe687d52420a109360f40bd5e6c74b3c5b3c..09019f551a04f831704d2aee1f7227731a96e8c2 100644 (file)
--- 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