diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index 5431f43b..58021320 100644 --- a/src/lib/commands/budg.c +++ b/src/lib/commands/budg.c @@ -51,10 +51,6 @@ #include "budg.h" #include "commands.h" -#ifndef MIN -#define MIN(x,y) ((x) > (y) ? (y) : (x)) -#endif - static void calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, int *bars, int *Nbars, int *mil, int *ships, int *sbuild, int *nsbuild, int *smaint, diff --git a/src/lib/common/bestpath.c b/src/lib/common/bestpath.c index fe0f3cad..0931a04e 100644 --- a/src/lib/common/bestpath.c +++ b/src/lib/common/bestpath.c @@ -109,7 +109,6 @@ static int owned_and_navigable(s_char *, int, int, s_char *, int); s_char *dirchar = "juygbn"; int dx[6] = { 2, 1, -1, -2, -1, 1 }; int dy[6] = { 0, -1, -1, 0, 1, 1 }; -int tmp; /* * Ok, note that here we malloc some buffers. BUT, we never diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c index 0eea0442..059cb30c 100644 --- a/src/lib/common/wantupd.c +++ b/src/lib/common/wantupd.c @@ -90,7 +90,6 @@ demand_update_time(time_t * now) static void regular_update_time(time_t * now, time_t * tim, time_t * delta) { - s_char *p; time_t tw; int secs_per_update; @@ -105,7 +104,7 @@ static int scheduled_update_time(time_t * now, int *which) { struct tm *tm; - s_char *p, *p1; + s_char *p; int curtime; int hour; diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index 7aa245fa..46d278aa 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -54,9 +54,6 @@ #include "server.h" -#ifndef MIN -#define MIN(x,y) ((x) < (y) ? (x) : (y)) -#endif #ifndef MAX #define MAX(x,y) ((x) < (y) ? (y) : (x)) #endif @@ -66,7 +63,6 @@ static void getilist(struct emp_qelem *list, natid own, struct emp_qelem *c, struct emp_qelem *d); static void ac_dog(register struct plist *ap, register struct plist *dp); -#define DOG_MAX 15 #define FLAK_MAX 15 /* -7 -6 -5 -4 -3 -2 -1 0 */ diff --git a/src/lib/subs/fortdef.c b/src/lib/subs/fortdef.c index 6f6a5e08..9da620a3 100644 --- a/src/lib/subs/fortdef.c +++ b/src/lib/subs/fortdef.c @@ -50,7 +50,6 @@ #include "optlist.h" #include "prototypes.h" -#define QUIET 0 #define NOISY 1 /* diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 23ab58cf..ebe72011 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -436,7 +436,6 @@ retreat_land1(struct lndstr *lp, s_char code, int orig) double mobcost; struct lchrstr *lcp; int time_to_stop; - s_char buf[RET_LEN - 1]; lp->lnd_mission = 0; if (lp->lnd_own == 0) diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index 2772610b..c24bb83c 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -142,7 +142,6 @@ struct look_list { struct lchrstr *lp; struct plchrstr *pp; struct mchrstr *mp; - int value; } l_u; int tech; } lookup_list[200]; /* Change this if there are ever more than 200 planes, ships