fix the unused macro, remove inline functions

simplification is good
This commit is contained in:
Enno Rehling 2014-03-15 20:33:43 -07:00
parent 8e42cb8143
commit 1a4cb16ea8
2 changed files with 2 additions and 10 deletions

View File

@ -105,9 +105,7 @@ leave_arena(struct unit *u, const struct item_type *itype, int amount,
return -1; return -1;
if (u->building != arena_tower(u->faction->magiegebiet) && leave_fail(u)) if (u->building != arena_tower(u->faction->magiegebiet) && leave_fail(u))
return -1; return -1;
unused(amount); unused(amount, ord, itype);
unused(ord);
unused(itype);
assert(!"not implemented"); assert(!"not implemented");
return 0; return 0;
} }

View File

@ -90,13 +90,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif #endif
#endif #endif
#if defined (__GNUC__) #define unused (void)
# 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__ || ..... */
#include "util/bool.h" #include "util/bool.h"