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 6b283ec47c64515fdd93e7e9810a5349fb86ed59..c85d3b63635c54622c03fa311b3408f559fb7f26 100644 (file)
--- 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 7070754a6faa064d27dc6e0e06c8b4d19beab7e9..85434081df51be532cff8b1954f4231d2c0e2554 100644 (file)
--- 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