From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 2 Nov 2018 22:28:20 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7dd1a81bc1ffac2518746291e1cacf4d80dbe85;p=thirdparty%2Fopen-vm-tools.git

Common header file change 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 8cf7b4b77..a5a095569 100644
--- a/open-vm-tools/lib/include/includeCheck.h
+++ b/open-vm-tools/lib/include/includeCheck.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2016, 2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -58,17 +58,17 @@
 /*
  * includeCheck.h --
  *
- *	Restrict include file use.
+ *      Restrict include file use.
  *
  * In every .h file, define one or more of these
  *
- *	INCLUDE_ALLOW_VMX 
- *	INCLUDE_ALLOW_USERLEVEL 
- *	INCLUDE_ALLOW_VMCORE
- *	INCLUDE_ALLOW_MODULE
- *	INCLUDE_ALLOW_VMKERNEL 
- *	INCLUDE_ALLOW_DISTRIBUTE
- *	INCLUDE_ALLOW_VMK_MODULE
+ *      INCLUDE_ALLOW_VMX
+ *      INCLUDE_ALLOW_USERLEVEL
+ *      INCLUDE_ALLOW_VMCORE
+ *      INCLUDE_ALLOW_MODULE
+ *      INCLUDE_ALLOW_VMKERNEL
+ *      INCLUDE_ALLOW_DISTRIBUTE
+ *      INCLUDE_ALLOW_VMK_MODULE
  *      INCLUDE_ALLOW_VMKDRIVERS
  *      INCLUDE_ALLOW_MKS
  *
@@ -80,24 +80,6 @@
  */
 
 
-/*
- * Declare a VMCORE-only variable to help classify object
- * files.  The variable goes in the common block and does
- * not create multiple definition link-time conflicts.
- */
-
-#if defined VMCORE && defined VMX86_DEVEL && defined VMX86_DEBUG && \
-    defined linux && !defined MODULE && \
-    !defined COMPILED_WITH_VMCORE
-#define COMPILED_WITH_VMCORE compiled_with_vmcore
-#ifdef ASM
-        .comm   compiled_with_vmcore, 0
-#else
-        asm(".comm compiled_with_vmcore, 0");
-#endif /* ASM */
-#endif
-
-
 #if defined VMCORE && \
     !(defined VMX86_VMX || defined VMM || \
       defined MONITOR_APP || defined VMMON)