Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

fix gcc 10 compatibility

Browse source
This commit is contained in:
Enno Rehling 2021-02-16 10:09:14 +01:00
parent b078c89dfb
commit 219ec117c6
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
s/cmake-init
View file

@ -48,6 +48,7 @@ fi
shift 1 shift 1
done done
git submodule update --init
ROOT=$(git rev-parse --show-toplevel) ROOT=$(git rev-parse --show-toplevel)
[ -z $BUILD ] && BUILD=Debug [ -z $BUILD ] && BUILD=Debug
[ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang" [ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang"

2
src/kernel/connection.h
View file

@ -126,7 +126,7 @@ extern "C" {
extern struct attrib_type at_countdown; extern struct attrib_type at_countdown;
/* game-specific callbacks */ /* game-specific callbacks */
void(*border_convert_cb) (struct connection * con, struct attrib * attr); extern void(*border_convert_cb) (struct connection * con, struct attrib * attr);
const char * border_name(const struct connection *co, const char * border_name(const struct connection *co,
const struct region * r, const struct faction * f, int flags); const struct region * r, const struct faction * f, int flags);

2
src/kernel/race.h
View file

@ -86,6 +86,7 @@ extern "C" {
#define MAX_START_RACE RC_ORC #define MAX_START_RACE RC_ORC
extern struct race *races;
extern int num_races; extern int num_races;
extern const char *racenames[MAXRACES]; extern const char *racenames[MAXRACES];
@ -151,7 +152,6 @@ extern "C" {
const struct race *findrace(const char *, const struct locale *); const struct race *findrace(const char *, const struct locale *);
struct race_list *get_familiarraces(void); struct race_list *get_familiarraces(void);
struct race *races;
const struct race *get_race(race_t rt); const struct race *get_race(race_t rt);
/** TODO: compatibility hacks: **/ /** TODO: compatibility hacks: **/
race_t old_race(const struct race *); race_t old_race(const struct race *);

3
src/prefix.h
View file

@ -6,9 +6,10 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern char **race_prefixes;
/* zero-terminated array of valid prefixes */
int add_raceprefix(const char *); int add_raceprefix(const char *);
char **race_prefixes; /* zero-terminated array of valid prefixes */
void free_prefixes(void); void free_prefixes(void);
#ifdef __cplusplus #ifdef __cplusplus

6
src/util/message.h
View file

@ -11,8 +11,6 @@ extern "C" {
#define MT_NEW_END ((const char *)0) #define MT_NEW_END ((const char *)0)
#define MAXSECTIONS 16 #define MAXSECTIONS 16
extern char *sections[MAXSECTIONS];
typedef struct arg_type { typedef struct arg_type {
struct arg_type *next; struct arg_type *next;
variant_type vtype; variant_type vtype;
@ -45,6 +43,9 @@ extern "C" {
/* msg_create(&mt_simplesentence, "enno", "eats", "chocolate", &locale_de); /* msg_create(&mt_simplesentence, "enno", "eats", "chocolate", &locale_de);
* parameters must be in the same order as they were for mt_new! */ * parameters must be in the same order as they were for mt_new! */
extern char *sections[MAXSECTIONS];
extern void(*msg_log_create) (const struct message * msg);
void msg_release(struct message *msg); void msg_release(struct message *msg);
struct message *msg_addref(struct message *msg); struct message *msg_addref(struct message *msg);
@ -62,7 +63,6 @@ extern "C" {
variant(*copy_arg) (variant), variant_type); variant(*copy_arg) (variant), variant_type);
arg_type *find_argtype(const char *name); arg_type *find_argtype(const char *name);
void(*msg_log_create) (const struct message * msg);
#ifdef __cplusplus #ifdef __cplusplus
} }