From a2138f6ecfd30c4a048776cd5c419be1337af7ee Mon Sep 17 00:00:00 2001 From: c vw Date: Fri, 7 Jan 2022 09:22:39 +0100 Subject: [PATCH] Moved variable discover_only_stemlab from stemlab_discovery.c to discovery.c, since it is used also if compiled without STEMLAB. --- discovery.c | 2 ++ discovery.h | 2 ++ stemlab_discovery.c | 2 -- stemlab_discovery.h | 2 -- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/discovery.c b/discovery.c index f8ba691..f5d839b 100644 --- a/discovery.c +++ b/discovery.c @@ -66,6 +66,8 @@ GtkWidget *tcpaddr; static char ipaddr_buf[IPADDR_LEN] = ""; char *ipaddr_radio = &ipaddr_buf[0]; +int discover_only_stemlab=0; + #ifdef CLIENT_SERVER GtkWidget *host_addr_entry; static char host_addr_buffer[128]="g0orx.ddns.net"; diff --git a/discovery.h b/discovery.h index ff724dd..aee6877 100644 --- a/discovery.h +++ b/discovery.h @@ -17,5 +17,7 @@ * */ +extern int discover_only_stemlab; + extern void discovery(void); extern char *ipaddr_radio; diff --git a/stemlab_discovery.c b/stemlab_discovery.c index 6e8887d..865eb8e 100644 --- a/stemlab_discovery.c +++ b/stemlab_discovery.c @@ -54,8 +54,6 @@ #include #endif -int discover_only_stemlab=0; - // As we only run in the GTK+ main event loop, which is single-threaded and // non-preemptive, we shouldn't need any additional synchronisation mechanisms. static bool discovery_done = FALSE; diff --git a/stemlab_discovery.h b/stemlab_discovery.h index db337b5..69f7a01 100644 --- a/stemlab_discovery.h +++ b/stemlab_discovery.h @@ -17,8 +17,6 @@ * */ -extern int discover_only_stemlab; - extern void stemlab_discovery(void); extern int stemlab_start_app(const char * const app_id); extern int alpine_start_app(const char * const app_id); -- 2.45.2