commit f27827d7937375b5348107ca7427abf74c9eff3d
from: michi <michi+ngircd@dataswamp.org>
via: Alexander Barton <alex@barton.de>
date: Sun Apr 19 22:20:46 2020 UTC

Unbreak GCC 10 (-fno-common) build

commit - 9c5e42458ea8dc2aa8db5f122aaa4296d31df67b
commit + f27827d7937375b5348107ca7427abf74c9eff3d
blob - f62e96754fa9ef610ef556f246f7b6f3711648cd
blob + e14e6c08037aa53e57fd40825bba446313ef1b68
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
@@ -10,6 +10,7 @@
  */
 
 #define CONN_MODULE
+#define CONN_MODULE_GLOBAL_INIT
 
 #include "portab.h"
 
blob - c642541f07ce486b712f5a3b0e719a438d9ea8da
blob + 869477f091f69f2f9ed2d7f6b40dbb8c7109a85b
--- src/ngircd/conn.h
+++ src/ngircd/conn.h
@@ -105,10 +105,18 @@ typedef struct _Connection
 #endif
 } CONNECTION;
 
-GLOBAL CONNECTION *My_Connections;
-GLOBAL CONN_ID Pool_Size;
-GLOBAL long WCounter;
 
+#ifdef CONN_MODULE_GLOBAL_INIT
+CONNECTION *My_Connections;
+CONN_ID Pool_Size;
+long WCounter;
+#else
+extern CONNECTION *My_Connections;
+extern CONN_ID Pool_Size;
+extern long WCounter;
+#endif
+
+
 #define CONNECTION2ID(x) (long)(x - My_Connections)
 
 #endif /* CONN_MODULE */
blob - 7166640ba054288c08030f331ddf9c9724e0a073
blob + 41255ca0d97eab650f96ef147fd7ceedb9bc34e3
--- src/ngircd/ngircd.c
+++ src/ngircd/ngircd.c
@@ -9,6 +9,7 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
+#define GLOBAL_INIT
 #include "portab.h"
 
 /**
blob - 70d5ed3ed26327fb14722df062b2a6b834bb6d93
blob + 43f2f9070c20caa28cdeee403d80b177dfa95b91
--- src/portab/portab.h
+++ src/portab/portab.h
@@ -102,7 +102,11 @@ typedef unsigned char bool;
 #endif
 
 #undef GLOBAL
+#ifdef GLOBAL_INIT
 #define GLOBAL
+#else
+#define GLOBAL extern
+#endif
 
 /* SPLint */