From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:40:38 +0000 (-0700)
Subject: Get rid of ASSERT_ALWAYS_AVAILABLE
X-Git-Tag: 2013.09.16-1328054~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c093dcb7a99a32aaf76fad143ff4a276f8d4bc22;p=thirdparty%2Fopen-vm-tools.git

Get rid of ASSERT_ALWAYS_AVAILABLE

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index 734bcc88f..619050a01 100644
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -180,11 +180,11 @@ EXTERN void WarningThrottled(uint32 *count, const char *fmt, ...)
     */
 
    #ifdef __GNUC__
-      #define ASSERT_IFNOT(cond, panic)                                              \
-                 ({if (UNLIKELY(!(cond))) { panic; if (0) { if (cond) { ; } } } (void)0;})
+      #define ASSERT_IFNOT(cond, panic)                                       \
+         ({if (UNLIKELY(!(cond))) { panic; if (0) { if (cond) {;}}} (void)0;})
    #else
-      #define ASSERT_IFNOT(cond, panic)                               \
-                 (UNLIKELY(!(cond)) ? (panic) : (void)0)
+      #define ASSERT_IFNOT(cond, panic)                                       \
+         (UNLIKELY(!(cond)) ? (panic) : (void)0)
    #endif
 #endif
 
@@ -196,7 +196,7 @@ EXTERN void WarningThrottled(uint32 *count, const char *fmt, ...)
  * ASSERT() is special cased because of interaction with Windows DDK.
  */
 
-#if defined VMX86_DEBUG || defined ASSERT_ALWAYS_AVAILABLE
+#if defined VMX86_DEBUG
 #undef ASSERT
 #define ASSERT(cond) \
            ASSERT_IFNOT(cond, _ASSERT_PANIC(AssertAssert))
@@ -307,7 +307,7 @@ do {                                                        \
  * Redefine macros that are only in debug versions
  */
 
-#if !defined VMX86_DEBUG && !defined ASSERT_ALWAYS_AVAILABLE // {
+#if !defined VMX86_DEBUG // {
 
 #undef  ASSERT
 #define ASSERT(cond) ((void) 0)