Improve portability to really outmoded compilers

A few modernisms have crept in:

* Trailing comma in enum definition (commit 71320ed, v4.3.10)

* // comment (commit 265e71e, v4.3.11)

* <stdint.h> (commit 9102ecc, v4.3.31)

  MSC actually chokes on this one.

Avoid them.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/optlist.h b/include/optlist.h
index b87873ce62cf3bb8227b8d3edff90095aba22e3e..676fabcc9d79e74a65b76581d9214e5b32ccc62d 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -64,7 +64,7 @@ enum {
 enum {
     UPD_DEMAND_NONE,           /* no demand updates */
     UPD_DEMAND_SCHED,          /* scheduled updates are demand updates */
-    UPD_DEMAND_ASYNC,          /* zdone triggers unscheduled update */
+    UPD_DEMAND_ASYNC           /* zdone triggers unscheduled update */
 };
 
 struct keymatch {

diff --git a/src/lib/gen/chance.c b/src/lib/gen/chance.c
index 210e8e8b34df04d1913910aa2b7777803e6ec295..b20dfb9bda63d54445ab06e097dcba95fae2661e 100644 (file)
--- a/src/lib/gen/chance.c
+++ b/src/lib/gen/chance.c
@@ -34,7 +34,6 @@
 
 #include <fcntl.h>
 #include <math.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -120,8 +119,12 @@ seed_prng(unsigned seed)
     init_genrand(seed);
 }
 
-static uint32_t
-djb_hash(uint32_t hash, void *buf, size_t sz)
+/*
+ * Note: this is DJB's hash function when unsigned is 32 bits and hash
+ * is initially 5381.
+ */
+static unsigned
+djb_hash(unsigned hash, void *buf, size_t sz)
 {
     unsigned char *bp;
 
@@ -138,7 +141,7 @@ unsigned
 pick_seed(void)
 {
     int fd;
-    uint32_t seed;
+    unsigned seed;
     int got_seed = 0;
     struct timeval tv;
     pid_t pid;

diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index f82471d751b4aaa3bc4ecd2840579fde899ced34..e6c6269cbe0321992ee7378123520584fa40b64d 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -78,7 +78,7 @@ upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp,
        neweff = n;
        *cost += work_cost;
        if (!n && IS_BIG_CITY(old_type) && !IS_BIG_CITY(*desig)) {
-           // FIXME use trunc_people() and total_work()
+           /* FIXME use trunc_people() and total_work() */
            int maxpop = max_population(np->nat_level[NAT_RLEV], *desig, n);
            if (vec[I_CIVIL] > maxpop)
                vec[I_CIVIL] = maxpop;