From 4f63d4892995eec6707f194b462c9fc3184ee85d Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Sat, 28 Dec 2019 17:07:58 +1100 Subject: [PATCH] Remove duplicate global definitions This fixes compiling with gcc-10. Reported by ixz. --- Changelog | 3 +++ source/commands.c | 1 - source/modules.c | 2 +- source/numbers.c | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 1eb4326..f7fd1e4 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,8 @@ [Changes 1.2.2] +* Remove duplicate global definitions to fix compiling with gcc 10. + Reported by ixz. (caf) + * Remove queueing of wildcard CSETs and fix use-after-free with queued CSETs. (caf) diff --git a/source/commands.c b/source/commands.c index d140d57..7fd81d6 100644 --- a/source/commands.c +++ b/source/commands.c @@ -118,7 +118,6 @@ extern int doing_notice; static void oper_password_received (char *, char *); -int no_hook_notify = 0; int load_depth = -1; extern char cx_function[]; diff --git a/source/modules.c b/source/modules.c index 52817fc..99d39bb 100644 --- a/source/modules.c +++ b/source/modules.c @@ -77,7 +77,7 @@ extern int BX_read_sockets(); extern int identd; extern int doing_notice; -int (*serv_open_func) (int, unsigned long, int); +extern int (*serv_open_func) (int, unsigned long, int); extern int (*serv_output_func) (int, int, char *, int); extern int (*serv_input_func) (int, char *, int, int, int); extern int (*serv_close_func) (int, unsigned long, int); diff --git a/source/numbers.c b/source/numbers.c index 741fca9..2f80f22 100644 --- a/source/numbers.c +++ b/source/numbers.c @@ -66,7 +66,6 @@ void show_server_map (void); int stats_k_grep (char **); void who_handlekill (char *, char *, char *); void handle_tracekill (int, char *, char *, char *); -int no_hook_notify; extern AJoinList *ajoin_list; void remove_from_server_list (int);