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~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b586cc541a0ead1bc60a6b11ec655e10e83c29c;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index af91747c5..04e90ac02 100644
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -101,7 +101,10 @@ extern "C" {
  * so it uses generic functions.
  */
 
-#if !defined VMM || defined MONITOR_APP // {
+#if !defined VMM ||                                                     \
+    defined BINARY_CHECKER || defined COREQUERY || defined DECODER ||   \
+    defined DIS16 || defined FROBOS || defined TRAPAPI_APP ||           \
+    defined VMM_LINKER || defined VMSS2CORE
 
 # if defined (VMKPANIC)
 #  include "vmk_assert.h"
@@ -115,8 +118,7 @@ extern "C" {
 #  define _ASSERT_PANIC_BUG_NORETURN(bug, name) \
            Panic(_##name##Fmt " bugNr=%d\n", __FILE__, __LINE__, bug)
 # endif /* VMKPANIC */
-
-#endif // }
+#endif
 
 
 // These strings don't have newline so that a bug can be tacked on.