From: VMware, Inc <>
Date: Thu, 22 Dec 2011 00:12:06 +0000 (-0800)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2011.12.20-562307~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f7b00ccbe2e09f3cd104df9a903d4f7dfb08b24;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/include/includeCheck.h b/open-vm-tools/lib/include/includeCheck.h
index c414d6daf..244bd9b2f 100644
--- a/open-vm-tools/lib/include/includeCheck.h
+++ b/open-vm-tools/lib/include/includeCheck.h
@@ -74,6 +74,7 @@
  *	INCLUDE_ALLOW_VMK_MODULE
  *      INCLUDE_ALLOW_VMKDRIVERS
  *      INCLUDE_ALLOW_VMIROM
+ *      INCLUDE_ALLOW_MKS
  *
  * Then include this file.
  *
@@ -157,3 +158,8 @@
 #error "The surrounding include file is not allowed in vmirom."
 #endif
 #undef INCLUDE_ALLOW_VMIROM
+
+#if defined INCLUDE_ALLOW_MKS && !defined LOCALMKS && !defined REMOTEMKS
+#error "The surrounding include file is not allowed outside of the MKS."
+#endif
+#undef INCLUDE_ALLOW_MKS