Clean up linkage of struct Modes to actually make sense.

(how did this work before? But it's been unchanged since at least 2013..) Maybe fixes #65
flightaware · Jun 6, 2020 · 0793c64 · 0793c64
1 parent 79c9877
commit 0793c64
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/dump1090.c b/dump1090.c
@@ -51,6 +51,8 @@
 
 #include <stdarg.h>
 
+struct _Modes Modes;
+
 //
 // ============================= Utility functions ==========================
 //

diff --git a/dump1090.h b/dump1090.h
@@ -295,7 +295,7 @@ struct mag_buf {
 };
 
 // Program global state
-struct {                             // Internal state
+struct _Modes {                             // Internal state
     pthread_t       reader_thread;
 
     pthread_mutex_t data_mutex;      // Mutex to synchronize buffer access
@@ -397,7 +397,9 @@ struct {                             // Internal state
     int stats_latest_1min;
     struct stats stats_5min;
     struct stats stats_15min;
-} Modes;
+};
+
+extern struct _Modes Modes;
 
 // The struct we use to store information about a decoded message.
 struct modesMessage {

diff --git a/faup1090.c b/faup1090.c
@@ -49,6 +49,8 @@
 
 #include "dump1090.h"
 
+struct _Modes Modes;
+
 #include <stdarg.h>
 
 void receiverPositionChanged(float lat, float lon, float alt)

diff --git a/view1090.c b/view1090.c
@@ -28,6 +28,9 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 #include "dump1090.h"
+
+struct _Modes Modes;
+
 //
 // ============================= Utility functions ==========================
 //