From 615973e95582e18abbcb2852febfe633d9e98cb6 Mon Sep 17 00:00:00 2001 From: NGGJamie Date: Fri, 15 Jan 2021 20:36:29 -0600 Subject: [PATCH] Changed Dev_Random definition to comply with GCC 10 flipping to -fno-common by default. --- src/numbers.c | 2 +- src/server.c | 2 +- src/server.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/numbers.c b/src/numbers.c index 5c62fa1..0bd8ebe 100644 --- a/src/numbers.c +++ b/src/numbers.c @@ -680,7 +680,7 @@ bf_random(Var arglist, Byte next, void *vdata, Objid progr) int mels_random() { - extern FILE *Dev_Random; + FILE *Dev_Random; int result; char buf[5]; /* read 4 bytes from /dev/urandom */ diff --git a/src/server.c b/src/server.c index a93764f..d93bdd8 100644 --- a/src/server.c +++ b/src/server.c @@ -440,7 +440,7 @@ main_loop(void) /* Open /dev/urandom and keep it open as long as the server is running so that our random() has a source of random bits. Dev_Random is defined globally in server.h */ - extern FILE *Dev_Random; + FILE *Dev_Random; Dev_Random = fopen("/dev/urandom", "r"); if (Dev_Random == NULL) panic("Couldn't open /dev/urandom"); diff --git a/src/server.h b/src/server.h index 09e9618..b3e3b4f 100644 --- a/src/server.h +++ b/src/server.h @@ -161,7 +161,7 @@ extern void boot_player(Objid player); extern void write_active_connections(void); extern int read_active_connections(void); -FILE *Dev_Random; /* Global file pointer for /dev/random */ +extern FILE *Dev_Random; /* Global file pointer for /dev/random */ #endif /* Server_H */