From 1a4cb16ea825f8445a8f1095e845922aec71f0e6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 15 Mar 2014 20:33:43 -0700 Subject: [PATCH] fix the unused macro, remove inline functions simplification is good --- src/modules/arena.c | 4 +--- src/platform.h | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/modules/arena.c b/src/modules/arena.c index 07334f961..1cc3333e9 100644 --- a/src/modules/arena.c +++ b/src/modules/arena.c @@ -105,9 +105,7 @@ leave_arena(struct unit *u, const struct item_type *itype, int amount, return -1; if (u->building != arena_tower(u->faction->magiegebiet) && leave_fail(u)) return -1; - unused(amount); - unused(ord); - unused(itype); + unused(amount, ord, itype); assert(!"not implemented"); return 0; } diff --git a/src/platform.h b/src/platform.h index 9aff2e2f1..9aeee4293 100644 --- a/src/platform.h +++ b/src/platform.h @@ -90,13 +90,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #endif #endif -#if defined (__GNUC__) -# define unused(a) /* unused: a */ -#elif defined (ghs) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__KCC) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) -# define unused(a) do {/* null */} while (&a == 0) -#else /* ghs || __GNUC__ || ..... */ -# define unused(a) (a) -#endif /* ghs || __GNUC__ || ..... */ +#define unused (void) #include "util/bool.h"