From fdc790db61d2a5c3d441735d18d22506afd72479 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 30 Apr 2006 16:26:51 +0000 Subject: [PATCH] (MAX): Remove redundant definition. --- src/lib/subs/aircombat.c | 5 ----- src/lib/update/distribute.c | 4 ---- 2 files changed, 9 deletions(-) diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index c47fd354..400055c6 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -53,11 +53,6 @@ #include "optlist.h" #include "server.h" - -#ifndef MAX -#define MAX(x,y) ((x) < (y) ? (y) : (x)) -#endif - static void getilist(struct emp_qelem *list, natid own, struct emp_qelem *a, struct emp_qelem *b, struct emp_qelem *c, struct emp_qelem *d); diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c index c821fc1d..5fcc9506 100644 --- a/src/lib/update/distribute.c +++ b/src/lib/update/distribute.c @@ -52,10 +52,6 @@ #define EXPORT_BONUS 10.0 #define IMPORT_BONUS 10.0 -#ifndef MAX -#define MAX(x,y) ((x) < (y) ? (y) : (x)) -#endif - int dodistribute(struct sctstr *sp, int imex, char *path, double dist_i_cost, double dist_e_cost)