diff options
| author | VMware, Inc <> | 2013-09-17 20:40:38 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-22 22:30:00 -0700 |
| commit | c093dcb7a99a32aaf76fad143ff4a276f8d4bc22 (patch) | |
| tree | b62055e7afd01dac60be640687b14462cae33d3a | |
| parent | 163a622e1fc4c4a68849a09448ee2aae662713ae (diff) | |
Get rid of ASSERT_ALWAYS_AVAILABLE
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
| -rw-r--r-- | open-vm-tools/lib/include/vm_assert.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h index 734bcc88..619050a0 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) |