Moved variable discover_only_stemlab from stemlab_discovery.c to

discovery.c, since it is used also if compiled without STEMLAB.

diff --git a/discovery.c b/discovery.c
index f8ba691be8cc49d911d1d4aabb1a95dde773c117..f5d839b5bb8c17d3cc80ba58134c714107f4a084 100644 (file)
--- 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 ff724dd9ae8965f154963b09175c65df7e84ada1..aee6877e375d64930fae174dcc8c73ba552846ba 100644 (file)
--- 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 6e8887dbdf18854fee92e0036ecfce6e1f94f7f6..865eb8e7c4e28e8d76dbf6fdd3fed707eadd4017 100644 (file)
--- a/stemlab_discovery.c
+++ b/stemlab_discovery.c
@@ -54,8 +54,6 @@
 #include <avahi-gobject/ga-service-resolver.h>
 #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 db337b5c846b0173d7c8a8caaf8229680ff5b9a3..69f7a0125d639603f9dd83f56f7ee1b4efef02c5 100644 (file)
--- 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);