From afc55d76e774f09d5fac5b7b180b3d97baf9c4b8 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 17 Jan 2001 15:18:45 +0000 Subject: [PATCH] New version of the UNUSED() macro. committer: mfx 979744725 +0000 --- src/conf.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/conf.h b/src/conf.h index 4f8f3ac0..55a45001 100644 --- a/src/conf.h +++ b/src/conf.h @@ -304,7 +304,7 @@ typedef RETSIGTYPE (SIGTYPEENTRY *sig_type)(int); #define COMPILE_TIME_ASSERT(expr) \ - { typedef int upx_compile_time_assert_fail[(expr) ? 1 : -1]; } + { typedef int __upx_compile_time_assert_fail[(expr) ? 1 : -1]; } /************************************************************************* @@ -336,10 +336,14 @@ typedef RETSIGTYPE (SIGTYPEENTRY *sig_type)(int); #define FREE(ptr) if (ptr) { free(ptr); ptr = NULL; } #undef UNUSED -#if defined(__BORLANDC__) -#define UNUSED(parm) ((void)(parm)) +#if 1 +# define UNUSED(var) { typedef int __upx_unused[sizeof(var) ? 2 : 1]; } +#elif 1 +# define UNUSED(var) do { } while (!sizeof(var)) +#elif defined(__BORLANDC__) +# define UNUSED(var) ((void)(var)) #else -#define UNUSED(parm) (parm = parm) +# define UNUSED(var) (var = var) #endif #define HIGH(array) ((unsigned) (sizeof(array)/sizeof((array)[0])))