COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / update / sect.c

diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index e8e5341503492e569f09f527a77140dbdc71582f..e4e8b43b92aa3640cfcbeb46ccfd0579857c87ef 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -32,6 +32,8 @@
  *     Steve McClure, 1996
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "sect.h"
 #include "nat.h"
@@ -95,7 +97,7 @@ upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp,
                + (vec[I_MILIT] * 2 / 5.0) + vec[I_UW];
            *workp = roundavg((etu * (*workp)) / 100.0);
 
-           buildeff_work = min((int)(*workp / 2), buildeff_work);
+           buildeff_work = MIN((int)(*workp / 2), buildeff_work);
        }
     }
     if (np->nat_priorities[*desig]) {
@@ -245,7 +247,7 @@ spread_fallout(struct sctstr *sp, int etus)
        inc = roundavg(etus * fallout_spread * (sp->sct_fallout)) - 1;
        if (inc < 0)
            inc = 0;
-       ap->sct_fallout = min(ap->sct_fallout + inc, FALLOUT_MAX);
+       ap->sct_fallout = MIN(ap->sct_fallout + inc, FALLOUT_MAX);
     }
 }