prep for merge

diff --git a/exit_menu.c b/exit_menu.c
index 8811ed71530486717496cb0b2330caa4b2f29b7f..2c24ce0815bf85277d07856a6c824d1b11315601 100644 (file)
--- a/exit_menu.c
+++ b/exit_menu.c
@@ -33,7 +33,9 @@
 #include "soapy_protocol.h"
 #endif
 #include "actions.h"
+#ifdef GPIO
 #include "gpio.h"
+#endif
 
 static GtkWidget *parent_window=NULL;
 

diff --git a/main.c b/main.c
index 4fb2ced1c7304ecc151b3197f843ad4127f504cb..d93fe9b1057b03f2d1ed88e619b4fbe15272c68e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -41,9 +41,9 @@
 #include "main.h"
 #include "channel.h"
 #include "discovered.h"
-#ifdef GPIO
-#include "actions.h"
 #include "configure.h"
+#include "actions.h"
+#ifdef GPIO
 #include "gpio.h"
 #endif
 #include "wdsp.h"

diff --git a/new_menu.c b/new_menu.c
index b8311cbc210a748cee68c39344acc1bb30009fb6..695edd45f8c8a86f92d0c4935bca6ca86783f927 100644 (file)
--- a/new_menu.c
+++ b/new_menu.c
@@ -57,10 +57,8 @@
 #include "vfo_menu.h"
 #include "fft_menu.h"
 #include "main.h"
-#ifdef GPIO
-#include "gpio.h"
 #include "actions.h"
-#endif
+#include "gpio.h"
 #include "old_protocol.h"
 #include "new_protocol.h"
 #ifdef CLIENT_SERVER

diff --git a/radio.c b/radio.c
index f8a781e5e343283d6d6ccdc0d23360c55ac3b083..783ac4e6e154ec01e522c610c8393777d6f0e07f 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -54,6 +54,7 @@
 #ifdef SOAPYSDR
 #include "soapy_protocol.h"
 #endif
+#include "actions.h"
 #include "gpio.h"
 #include "vfo.h"
 #include "vox.h"