From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 7 Oct 2021 06:40:31 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8929bd9db5fc57a76491d3f1d8e314955c7b5823;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 929b14062..c7d3607af 100644
--- a/open-vm-tools/lib/include/includeCheck.h
+++ b/open-vm-tools/lib/include/includeCheck.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2019, 2021 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
@@ -79,11 +79,8 @@
  * that this is acceptable.
  */
 
-
-#if defined VMCORE && \
-    !(defined VMX86_VMX || defined VMM || defined ULM || \
-      defined MONITOR_APP || defined VMMON)
-#error "VMCORE without VMX86_VMX, VMM, ULM, MONITOR_APP, or VMMON."
+#if defined VMM && defined ULM
+#error "VMM and ULM cannot be defined at the same time."
 #endif
 
 #if defined VMCORE && !defined INCLUDE_ALLOW_VMCORE