From 39e155efe71f9f2a84f42b5f64f510135173aa85 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 30 Aug 2025 09:17:16 +0200 Subject: [PATCH] Fix include config.h It should be included, with its path, before any hamlib include and before any #ifdef that uses the symbols that it defines. --- lib/precise_time.c | 2 +- rigs/anytone/anytone.c | 2 +- rigs/barrett/barrett.c | 2 +- rigs/dummy/dummy.c | 2 +- rigs/dummy/flrig.c | 2 +- rigs/dummy/netrigctl.c | 2 +- rigs/dummy/quisk.c | 2 +- rigs/dummy/tci1x.c | 2 +- rigs/dummy/trxmanager.c | 2 +- rigs/kit/usrp_impl.cc | 2 +- rigs/winradio/g313-posix.c | 2 +- rigs/winradio/linradio/wrg313api.c | 2 +- rotators/androidsensor/androidsensor.cpp | 2 +- rotators/grbltrk/grbltrk.c | 2 +- security/AESStringCrypt.c | 2 +- src/fifo.c | 6 ++++-- src/parallel.h | 2 +- tests/rigtestlibusb.c | 2 +- tests/rigtestmcastrx.c | 2 +- tests/testnet.c | 2 +- 20 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/precise_time.c b/lib/precise_time.c index 7639a7a26..677c516b5 100644 --- a/lib/precise_time.c +++ b/lib/precise_time.c @@ -20,7 +20,7 @@ // along with fldigi. If not, see . // --------------------------------------------------------------------- -#include "config.h" +#include "hamlib/config.h" #include #include #include diff --git a/rigs/anytone/anytone.c b/rigs/anytone/anytone.c index 3945d08f6..6615560dc 100644 --- a/rigs/anytone/anytone.c +++ b/rigs/anytone/anytone.c @@ -34,7 +34,7 @@ // HAMLIB INCLUDES // --------------------------------------------------------------------------- -#include "config.h" +#include "hamlib/config.h" #include "hamlib/rig.h" #include "serial.h" #include "misc.h" diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c index c9d46c6cf..026debcd4 100644 --- a/rigs/barrett/barrett.c +++ b/rigs/barrett/barrett.c @@ -19,7 +19,7 @@ * */ -#include "config.h" +#include "hamlib/config.h" #include #include #include diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c index dc9b5c69a..ac45cac61 100644 --- a/rigs/dummy/dummy.c +++ b/rigs/dummy/dummy.c @@ -20,7 +20,7 @@ * */ -#include "config.h" +#include "hamlib/config.h" // cppcheck-suppress * #include // cppcheck-suppress * diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c index 597856cab..6343fb352 100644 --- a/rigs/dummy/flrig.c +++ b/rigs/dummy/flrig.c @@ -20,7 +20,7 @@ * */ -#include "config.h" +#include "hamlib/config.h" #include #include #include /* String function definitions */ diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c index b5551ca14..19df9eef0 100644 --- a/rigs/dummy/netrigctl.c +++ b/rigs/dummy/netrigctl.c @@ -19,7 +19,7 @@ * */ -#include "config.h" +#include "hamlib/config.h" #include #include #include /* String function definitions */ diff --git a/rigs/dummy/quisk.c b/rigs/dummy/quisk.c index 2fa52ec8d..9c9893d57 100644 --- a/rigs/dummy/quisk.c +++ b/rigs/dummy/quisk.c @@ -19,7 +19,7 @@ * */ -#include "config.h" +#include "hamlib/config.h" #include #include #include /* String function definitions */ diff --git a/rigs/dummy/tci1x.c b/rigs/dummy/tci1x.c index 286b1c71a..51dbdbd49 100644 --- a/rigs/dummy/tci1x.c +++ b/rigs/dummy/tci1x.c @@ -19,7 +19,7 @@ * */ -#include "config.h" +#include "hamlib/config.h" #include #include #include /* String function definitions */ diff --git a/rigs/dummy/trxmanager.c b/rigs/dummy/trxmanager.c index 3c9dfe649..aa21ee3d3 100644 --- a/rigs/dummy/trxmanager.c +++ b/rigs/dummy/trxmanager.c @@ -20,7 +20,7 @@ * */ -#include "config.h" +#include "hamlib/config.h" #include #include #include /* String function definitions */ diff --git a/rigs/kit/usrp_impl.cc b/rigs/kit/usrp_impl.cc index 7c1cc9e2a..23e9de3bc 100644 --- a/rigs/kit/usrp_impl.cc +++ b/rigs/kit/usrp_impl.cc @@ -19,7 +19,7 @@ * */ -#include +#include "hamlib/config.h" /* * Compile only this model if usrp is available diff --git a/rigs/winradio/g313-posix.c b/rigs/winradio/g313-posix.c index fd64ea595..1c0a04027 100644 --- a/rigs/winradio/g313-posix.c +++ b/rigs/winradio/g313-posix.c @@ -23,7 +23,7 @@ #include #include -#include "config.h" +#include "hamlib/config.h" #ifdef HAVE_DLFCN_H # include diff --git a/rigs/winradio/linradio/wrg313api.c b/rigs/winradio/linradio/wrg313api.c index 3c6503c63..4191dfaa7 100644 --- a/rigs/winradio/linradio/wrg313api.c +++ b/rigs/winradio/linradio/wrg313api.c @@ -2,7 +2,7 @@ #include -#include "config.h" +#include "hamlib/config.h" #ifdef HAVE_DLFCN_H # include diff --git a/rotators/androidsensor/androidsensor.cpp b/rotators/androidsensor/androidsensor.cpp index d970647be..6aa0ea5fc 100644 --- a/rotators/androidsensor/androidsensor.cpp +++ b/rotators/androidsensor/androidsensor.cpp @@ -21,7 +21,7 @@ * */ -#include +#include "hamlib/config.h" #include #include diff --git a/rotators/grbltrk/grbltrk.c b/rotators/grbltrk/grbltrk.c index 50989e582..f087ca17e 100644 --- a/rotators/grbltrk/grbltrk.c +++ b/rotators/grbltrk/grbltrk.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "hamlib/config.h" #endif #include diff --git a/security/AESStringCrypt.c b/security/AESStringCrypt.c index 819eb4817..a19a072d5 100644 --- a/security/AESStringCrypt.c +++ b/security/AESStringCrypt.c @@ -28,7 +28,7 @@ * BUT NOT LIMITED TO, LOSS OF DATA OR DATA BEING RENDERED INACCURATE. */ -#include "config.h" +#include "hamlib/config.h" #include #include diff --git a/src/fifo.c b/src/fifo.c index cd112a9d7..ba090ee61 100644 --- a/src/fifo.c +++ b/src/fifo.c @@ -1,8 +1,10 @@ -#include "hamlib/rig.h" +#include "hamlib/config.h" + #include #include + +#include "hamlib/rig.h" #include "fifo.h" -#include "config.h" void initFIFO(FIFO_RIG *fifo) { diff --git a/src/parallel.h b/src/parallel.h index 9eae56b55..fa5dff024 100644 --- a/src/parallel.h +++ b/src/parallel.h @@ -23,7 +23,7 @@ #ifndef _PARALLEL_H #define _PARALLEL_H 1 -#include "config.h" +#include "hamlib/config.h" #include "hamlib/rig.h" #ifdef HAVE_PARALLEL diff --git a/tests/rigtestlibusb.c b/tests/rigtestlibusb.c index 45d82906e..119625152 100644 --- a/tests/rigtestlibusb.c +++ b/tests/rigtestlibusb.c @@ -25,7 +25,7 @@ #include #include #include -#include "config.h" +#include #if defined(HAVE_LIBUSB_H) #include #elif defined(HAVE_LIBUSB_1_0_LIBUSB_H) diff --git a/tests/rigtestmcastrx.c b/tests/rigtestmcastrx.c index 1be2b7fe3..a7100d005 100644 --- a/tests/rigtestmcastrx.c +++ b/tests/rigtestmcastrx.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include #include diff --git a/tests/testnet.c b/tests/testnet.c index 84411446a..67d939c62 100644 --- a/tests/testnet.c +++ b/tests/testnet.c @@ -9,7 +9,7 @@ #include #include -#include "config.h" +#include #ifdef HAVE_NETINET_IN_H # include