From: Matthew Beeching Date: Thu, 16 Feb 2023 20:35:07 +0000 (+0000) Subject: Merge pull request #44 from evilnet/bugfix/master/43-duplicate-definitions X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/commitdiff_plain/364d35b760a3a968e5691b5c7b610f4395f8d495?hp=5512b580eb0f7cd1827e6f0eb0623b6fedfb1be9 Merge pull request #44 from evilnet/bugfix/master/43-duplicate-definitions added extern type to comply with gcc10 change --- diff --git a/src/chanserv.c b/src/chanserv.c index ae5f28d..5931cd0 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -679,7 +679,7 @@ enum note_visible_type NOTE_VIS_PRIVILEGED }; -struct io_fd *socket_io_fd; +extern struct io_fd *socket_io_fd; extern struct cManagerNode cManager; struct note_type diff --git a/src/log.c b/src/log.c index 54d9ce3..b7f885a 100644 --- a/src/log.c +++ b/src/log.c @@ -27,7 +27,7 @@ #define Block 4096 #define MAXLOGSEARCHLENGTH 10000 -struct userNode *chanserv; +extern struct userNode *chanserv; struct logDestination;