From fb769ffaf9ce63a68881f720d517da3e73786706 Mon Sep 17 00:00:00 2001 From: c vw Date: Thu, 3 Jun 2021 16:53:58 +0200 Subject: [PATCH] prep for merge --- exit_menu.c | 2 ++ main.c | 4 ++-- new_menu.c | 4 +--- radio.c | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/exit_menu.c b/exit_menu.c index 8811ed7..2c24ce0 100644 --- 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 4fb2ced..d93fe9b 100644 --- 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 b8311cb..695edd4 100644 --- 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 f8a781e..783ac4e 100644 --- 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" -- 2.45.2