From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:41 +0000 (-0700)
Subject: Replace ASSERT_DEVEL(p) with DEVEL_ONLY(ASSERT(p))
X-Git-Tag: stable-10.2.0~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45212bdaa54e336f53327f571b0aad48b89c787d;p=thirdparty%2Fopen-vm-tools.git

Replace ASSERT_DEVEL(p) with DEVEL_ONLY(ASSERT(p))

It wasn't clear when ASSERT_DEVEL was enabled: was
it for all VMX86_DEVEL builds or for the intersection of
VMX86_DEVEL and VMX86_DEBUG?

Replace ASSERT_DEVEL(p) with DEVEL_ONLY(ASSERT(p)) to make it
clear that it's the latter.
---

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index 1d2566263..edd209ed4 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-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2017 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
@@ -228,10 +228,8 @@ void WarningThrottled(uint32 *count, const char *fmt, ...) PRINTF_DECL(2, 3);
            ASSERT_IFNOT(cond, _ASSERT_PANIC(AssertMemAlloc))
 
 #ifdef VMX86_DEVEL
-#define ASSERT_DEVEL(cond) ASSERT(cond)
 #define NOT_TESTED()       Warning(_AssertNotTestedFmt "\n", __FILE__, __LINE__)
 #else
-#define ASSERT_DEVEL(cond) ((void)0)
 #define NOT_TESTED()       Log(_AssertNotTestedFmt "\n", __FILE__, __LINE__)
 #endif