1From 02153cb0b2d1083dcd587798d9ef7ce963739622 Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Wed, 19 Aug 2020 18:46:17 +0200 4Subject: [PATCH] dump1090.h: fix build with gcc 10 5 6Fix the following build failures on gcc 10 (where -fno-common is enabled 7by default): 8 9/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: multiple definition of `Modes'; /home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: multiple definition of `Modes'; dump1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: first defined here 10 11/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:238: multiple definition of `tDF'; dump1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:238: first defined here 12/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: view1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: first defined here 13 14Fixes: 15 - http://autobuild.buildroot.org/results/88dc97fcaa649014edb3b54a5dd4bd8ec4715bbd 16 17Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 18[Upstream status: https://github.com/MalcolmRobb/dump1090/pull/96] 19--- 20 dump1090.c | 3 +++ 21 dump1090.h | 4 ++-- 22 view1090.c | 3 +++ 23 3 files changed, 8 insertions(+), 2 deletions(-) 24 25diff --git a/dump1090.c b/dump1090.c 26index 60882fc..1482224 100644 27--- a/dump1090.c 28+++ b/dump1090.c 29@@ -29,6 +29,9 @@ 30 // 31 #include "coaa.h" 32 #include "dump1090.h" 33+ 34+struct modes Modes; 35+ 36 // 37 // ============================= Utility functions ========================== 38 // 39diff --git a/dump1090.h b/dump1090.h 40index 9ad4de0..283e760 100644 41--- a/dump1090.h 42+++ b/dump1090.h 43@@ -235,10 +235,10 @@ struct stDF { 44 uint64_t llTimestamp; // Timestamp at which the this packet was received 45 uint32_t addr; // Timestamp at which the this packet was received 46 unsigned char msg[MODES_LONG_MSG_BYTES]; // the binary 47-} tDF; 48+}; 49 50 // Program global state 51-struct { // Internal state 52+extern struct modes { // Internal state 53 pthread_t reader_thread; 54 55 pthread_mutex_t data_mutex; // Mutex to synchronize buffer access 56diff --git a/view1090.c b/view1090.c 57index 0b9b8b9..cc072fc 100644 58--- a/view1090.c 59+++ b/view1090.c 60@@ -29,6 +29,9 @@ 61 // 62 #include "coaa.h" 63 #include "view1090.h" 64+ 65+struct modes Modes; 66+ 67 // 68 // ============================= Utility functions ========================== 69 // 70-- 712.27.0 72 73