From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 20 Jan 2022 19:40:15 +0000 (-0800)
Subject: Changes to common source files not applicable to open-vm-tools.
X-Git-Tag: stable-12.1.0~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ebabe69f0d864bfaa28bf8773a4c8a51e29416;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/includeCheck.h b/open-vm-tools/lib/include/includeCheck.h
index 6b283ec47..c85d3b636 100644
--- a/open-vm-tools/lib/include/includeCheck.h
+++ b/open-vm-tools/lib/include/includeCheck.h
@@ -101,7 +101,7 @@
 
 #if defined USERLEVEL && !defined VMX86_VMX && !defined VMCORE && \
     !defined ULM && !defined INCLUDE_ALLOW_USERLEVEL && \
-    !defined INCLUDE_ALLOW_MKS
+    !defined INCLUDE_ALLOW_MKS && !defined VSAN_USERLEVEL
 #error "The surrounding include file is not allowed at userlevel."
 #endif
 #undef INCLUDE_ALLOW_USERLEVEL
diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 7070754a6..85434081d 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -563,7 +563,7 @@ typedef uint128 UReg128;
 
 #if (defined(VMM) || defined(COREQUERY) || defined(EXTDECODER) ||  \
      defined (VMKERNEL) || defined (VMKBOOT) || defined (ULM)) &&  \
-    !defined (FROBOS)
+    !defined (FROBOS) || defined (VSAN_USERLEVEL)
 typedef  Reg64  Reg;
 typedef UReg64 UReg;
 #endif