oonf-olsrd2: fix static problems 612/head
authorRosen Penev <rosenp@gmail.com>
Sun, 4 Oct 2020 21:46:59 +0000 (14:46 -0700)
committerRosen Penev <rosenp@gmail.com>
Mon, 5 Oct 2020 22:50:26 +0000 (15:50 -0700)
The GCC 10 patch marked several variables in headers as extern, which
is correct. However some upstream change marked the definitions as
static even though the definition was not local to the c files.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
oonf-olsrd2/patches/020-static.patch [new file with mode: 0644]

diff --git a/oonf-olsrd2/patches/020-static.patch b/oonf-olsrd2/patches/020-static.patch
new file mode 100644 (file)
index 0000000..e1f3715
--- /dev/null
@@ -0,0 +1,32 @@
+--- a/src-plugins/nhdp/nhdp/nhdp.c
++++ b/src-plugins/nhdp/nhdp/nhdp.c
+@@ -187,9 +187,9 @@ static struct oonf_rfc5444_protocol *_protocol;
+ static struct netaddr _originator_v4, _originator_v6;
+ /* logging sources for NHDP subsystem */
+-static enum oonf_log_source LOG_NHDP;
+-static enum oonf_log_source LOG_NHDP_R;
+-static enum oonf_log_source LOG_NHDP_W;
++enum oonf_log_source LOG_NHDP;
++enum oonf_log_source LOG_NHDP_R;
++enum oonf_log_source LOG_NHDP_W;
+ /**
+  * Initialize additional logging sources for NHDP
+--- a/src-plugins/olsrv2/olsrv2/olsrv2.c
++++ b/src-plugins/olsrv2/olsrv2/olsrv2.c
+@@ -255,10 +255,10 @@ static uint64_t _overwrite_tc_interval;
+ static uint64_t _overwrite_tc_validity;
+ /* Additional logging sources */
+-static enum oonf_log_source LOG_OLSRV2;
+-static enum oonf_log_source LOG_OLSRV2_R;
+-static enum oonf_log_source LOG_OLSRV2_ROUTING;
+-static enum oonf_log_source LOG_OLSRV2_W;
++enum oonf_log_source LOG_OLSRV2;
++enum oonf_log_source LOG_OLSRV2_R;
++enum oonf_log_source LOG_OLSRV2_ROUTING;
++enum oonf_log_source LOG_OLSRV2_W;
+ /**
+  * Initialize additional logging sources for NHDP