From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 29 Jul 2022 03:03:42 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.1.0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7452011db95a49aaaa19c293fb1ff1ea0944d6db;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 c96f62a66..b1c0719bf 100644
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2021 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2022 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
@@ -361,13 +361,16 @@ void WarningThrottled(uint32 *count, const char *fmt, ...) PRINTF_DECL(2, 3);
  *
  */
 
-# if defined VMKPANIC || defined VMM
+# if defined VMKPANIC
 #  undef  NOT_REACHED
 #  if defined __GNUC__ && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 5)
 #   define NOT_REACHED() (__builtin_unreachable())
 #  else
 #   define NOT_REACHED() ((void)0)
 #  endif
+# elif defined VMM || defined ULM_ESX
+#  undef  NOT_REACHED
+#  define NOT_REACHED() (__builtin_unreachable())
 # else
  // keep debug definition
 # endif