empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve portability to really outmoded compilers

Browse source 
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>
This commit is contained in:
Markus Armbruster 2015-05-14 09:27:05 +02:00
parent 7f68f37433
commit 341b1b4d15
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/optlist.h
View file

@ -64,7 +64,7 @@ enum {
enum { enum {
UPD_DEMAND_NONE, /* no demand updates */ UPD_DEMAND_NONE, /* no demand updates */
UPD_DEMAND_SCHED, /* scheduled updates are 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 { struct keymatch {

11
src/lib/gen/chance.c
View file

@ -34,7 +34,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <math.h> #include <math.h>
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
@ -120,8 +119,12 @@ seed_prng(unsigned seed)
init_genrand(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; unsigned char *bp;
@ -138,7 +141,7 @@ unsigned
pick_seed(void) pick_seed(void)
{ {
int fd; int fd;
uint32_t seed; unsigned seed;
int got_seed = 0; int got_seed = 0;
struct timeval tv; struct timeval tv;
pid_t pid; pid_t pid;

2
src/lib/update/sect.c
View file

@ -78,7 +78,7 @@ upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp,
neweff = n; neweff = n;
*cost += work_cost; *cost += work_cost;
if (!n && IS_BIG_CITY(old_type) && !IS_BIG_CITY(*desig)) { 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); int maxpop = max_population(np->nat_level[NAT_RLEV], *desig, n);
if (vec[I_CIVIL] > maxpop) if (vec[I_CIVIL] > maxpop)
vec[I_CIVIL] = maxpop; vec[I_CIVIL] = maxpop;