From 68e121d82c8000d60075c51a9e1f115772ad0620 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 4 Feb 2022 07:41:36 -0600 Subject: [PATCH] Change all to remove HAVE_CONFIG dependency and include by default This is necessary to keep alignment between the client view of rig->state and the shared libarary view Including PTHREAD functions in rig->state necessitated this as HAVE_PTHREAD only defined during hamlib compilation. Clients including hamlib/rig.h did not pick up all the HAVE* config variable that control what gets included https://github.com/Hamlib/Hamlib/issues/947 --- amplifiers/elecraft/Android.mk | 2 +- amplifiers/elecraft/kpa1500.c | 4 +--- bindings/hamlib.swg | 4 +--- c++/ampclass.cc | 4 +--- c++/rigclass.cc | 4 +--- c++/rotclass.cc | 4 +--- cppcheck.sh | 1 - extra/gnuradio/gnuradio.cc | 4 +--- extra/gnuradio/gr.c | 4 +--- extra/gnuradio/graudio.c | 4 +--- extra/gnuradio/mc4020.c | 4 +--- lib/asyncpipe.c | 4 +--- lib/getaddrinfo.c | 4 +--- lib/getopt.c | 4 +--- lib/getopt_long.c | 4 +--- rigs/adat/Android.mk | 2 +- rigs/adat/adat.c | 4 +--- rigs/adat/adt_200a.c | 4 +--- rigs/alinco/Android.mk | 2 +- rigs/alinco/alinco.c | 4 +--- rigs/alinco/dx77.c | 4 +--- rigs/alinco/dxsr8.c | 4 +--- rigs/aor/Android.mk | 2 +- rigs/aor/aor.c | 4 +--- rigs/aor/ar2700.c | 4 +--- rigs/aor/ar3000.c | 4 +--- rigs/aor/ar3030.c | 4 +--- rigs/aor/ar5000.c | 4 +--- rigs/aor/ar7030.c | 4 +--- rigs/aor/ar7030p.c | 4 +--- rigs/aor/ar8000.c | 4 +--- rigs/aor/ar8200.c | 4 +--- rigs/aor/ar8600.c | 4 +--- rigs/aor/sr2200.c | 4 +--- rigs/barrett/4050.c | 4 +--- rigs/barrett/950.c | 4 +--- rigs/barrett/Android.mk | 2 +- rigs/barrett/barrett.c | 4 +--- rigs/codan/Android.mk | 2 +- rigs/codan/codan.c | 4 +--- rigs/dorji/Android.mk | 2 +- rigs/dorji/dorji.c | 4 +--- rigs/dorji/dra818.c | 4 +--- rigs/drake/Android.mk | 2 +- rigs/drake/drake.c | 4 +--- rigs/drake/r8a.c | 4 +--- rigs/drake/r8b.c | 4 +--- rigs/dummy/Android.mk | 2 +- rigs/dummy/amp_dummy.c | 4 +--- rigs/dummy/dummy.c | 4 +--- rigs/dummy/dummy_common.c | 4 +--- rigs/dummy/flrig.c | 4 +--- rigs/dummy/netampctl.c | 4 +--- rigs/dummy/netrigctl.c | 4 +--- rigs/dummy/netrotctl.c | 4 +--- rigs/dummy/rot_dummy.c | 4 +--- rigs/dummy/tci1x.c | 4 +--- rigs/dummy/trxmanager.c | 4 +--- rigs/elad/Android.mk | 2 +- rigs/elad/elad.c | 4 +--- rigs/elad/fdm_duo.c | 4 +--- rigs/flexradio/Android.mk | 2 +- rigs/flexradio/dttsp.c | 4 +--- rigs/flexradio/flexradio.c | 4 +--- rigs/flexradio/sdr1k.c | 4 +--- rigs/icmarine/Android.mk | 2 +- rigs/icmarine/icm700pro.c | 4 +--- rigs/icmarine/icm710.c | 4 +--- rigs/icmarine/icm802.c | 4 +--- rigs/icmarine/icm803.c | 4 +--- rigs/icmarine/icmarine.c | 4 +--- rigs/icom/Android.mk | 2 +- rigs/icom/delta2.c | 4 +--- rigs/icom/frame.c | 4 +--- rigs/icom/ic1275.c | 4 +--- rigs/icom/ic271.c | 4 +--- rigs/icom/ic2730.c | 4 +--- rigs/icom/ic275.c | 4 +--- rigs/icom/ic471.c | 4 +--- rigs/icom/ic475.c | 4 +--- rigs/icom/ic7000.c | 4 +--- rigs/icom/ic703.c | 4 +--- rigs/icom/ic706.c | 4 +--- rigs/icom/ic707.c | 4 +--- rigs/icom/ic7100.c | 4 +--- rigs/icom/ic718.c | 4 +--- rigs/icom/ic7200.c | 4 +--- rigs/icom/ic725.c | 4 +--- rigs/icom/ic726.c | 4 +--- rigs/icom/ic728.c | 4 +--- rigs/icom/ic7300.c | 4 +--- rigs/icom/ic735.c | 4 +--- rigs/icom/ic736.c | 4 +--- rigs/icom/ic737.c | 4 +--- rigs/icom/ic738.c | 4 +--- rigs/icom/ic7410.c | 4 +--- rigs/icom/ic746.c | 4 +--- rigs/icom/ic751.c | 4 +--- rigs/icom/ic756.c | 4 +--- rigs/icom/ic7600.c | 4 +--- rigs/icom/ic761.c | 4 +--- rigs/icom/ic7610.c | 4 +--- rigs/icom/ic765.c | 4 +--- rigs/icom/ic7700.c | 4 +--- rigs/icom/ic775.c | 4 +--- rigs/icom/ic78.c | 4 +--- rigs/icom/ic7800.c | 4 +--- rigs/icom/ic781.c | 4 +--- rigs/icom/ic785x.c | 4 +--- rigs/icom/ic820h.c | 4 +--- rigs/icom/ic821h.c | 4 +--- rigs/icom/ic910.c | 4 +--- rigs/icom/ic9100.c | 4 +--- rigs/icom/ic92d.c | 4 +--- rigs/icom/ic970.c | 4 +--- rigs/icom/icf8101.c | 4 +--- rigs/icom/icom.c | 4 +--- rigs/icom/icr10.c | 4 +--- rigs/icom/icr20.c | 4 +--- rigs/icom/icr30.c | 4 +--- rigs/icom/icr6.c | 4 +--- rigs/icom/icr7000.c | 4 +--- rigs/icom/icr71.c | 4 +--- rigs/icom/icr72.c | 4 +--- rigs/icom/icr75.c | 4 +--- rigs/icom/icr8500.c | 4 +--- rigs/icom/icr8600.c | 4 +--- rigs/icom/icr9000.c | 4 +--- rigs/icom/icr9500.c | 4 +--- rigs/icom/icrx7.c | 4 +--- rigs/icom/id1.c | 4 +--- rigs/icom/id31.c | 4 +--- rigs/icom/id4100.c | 4 +--- rigs/icom/id51.c | 4 +--- rigs/icom/id5100.c | 4 +--- rigs/icom/omni.c | 4 +--- rigs/icom/optoscan.c | 4 +--- rigs/icom/os456.c | 4 +--- rigs/icom/os535.c | 4 +--- rigs/icom/perseus.c | 4 +--- rigs/icom/xiegu.c | 4 +--- rigs/jrc/Android.mk | 2 +- rigs/jrc/jrc.c | 4 +--- rigs/jrc/jst145.c | 4 +--- rigs/jrc/nrd525.c | 4 +--- rigs/jrc/nrd535.c | 4 +--- rigs/jrc/nrd545.c | 4 +--- rigs/kachina/505dsp.c | 4 +--- rigs/kachina/Android.mk | 2 +- rigs/kachina/kachina.c | 4 +--- rigs/kenwood/Android.mk | 2 +- rigs/kenwood/flex6xxx.c | 4 +--- rigs/kenwood/ic10.c | 4 +--- rigs/kenwood/k2.c | 4 +--- rigs/kenwood/k3.c | 4 +--- rigs/kenwood/pihpsdr.c | 4 +--- rigs/kenwood/r5000.c | 4 +--- rigs/kenwood/th.c | 4 +--- rigs/kenwood/thd7.c | 4 +--- rigs/kenwood/thd72.c | 4 +--- rigs/kenwood/thd74.c | 4 +--- rigs/kenwood/thf6a.c | 4 +--- rigs/kenwood/thf7.c | 4 +--- rigs/kenwood/thg71.c | 4 +--- rigs/kenwood/tmd700.c | 4 +--- rigs/kenwood/tmd710.c | 4 +--- rigs/kenwood/tmv7.c | 4 +--- rigs/kenwood/transfox.c | 4 +--- rigs/kenwood/trc80.c | 4 +--- rigs/kenwood/ts140.c | 4 +--- rigs/kenwood/ts2000.c | 4 +--- rigs/kenwood/ts440.c | 4 +--- rigs/kenwood/ts450s.c | 4 +--- rigs/kenwood/ts480.c | 4 +--- rigs/kenwood/ts50s.c | 4 +--- rigs/kenwood/ts570.c | 4 +--- rigs/kenwood/ts590.c | 4 +--- rigs/kenwood/ts680.c | 4 +--- rigs/kenwood/ts690.c | 4 +--- rigs/kenwood/ts711.c | 4 +--- rigs/kenwood/ts790.c | 4 +--- rigs/kenwood/ts811.c | 4 +--- rigs/kenwood/ts850.c | 4 +--- rigs/kenwood/ts870s.c | 4 +--- rigs/kenwood/ts890s.c | 4 +--- rigs/kenwood/ts930.c | 4 +--- rigs/kenwood/ts940.c | 4 +--- rigs/kenwood/ts950.c | 4 +--- rigs/kenwood/ts990s.c | 4 +--- rigs/kenwood/tx500.c | 4 +--- rigs/kenwood/xg3.c | 4 +--- rigs/kit/Android.mk | 2 +- rigs/kit/dds60.c | 4 +--- rigs/kit/drt1.c | 4 +--- rigs/kit/dwt.c | 4 +--- rigs/kit/elektor304.c | 4 +--- rigs/kit/elektor507.c | 4 +--- rigs/kit/fifisdr.c | 4 +--- rigs/kit/funcube.c | 4 +--- rigs/kit/hiqsdr.c | 4 +--- rigs/kit/kit.c | 4 +--- rigs/kit/miniVNA.c | 4 +--- rigs/kit/pcrotor.c | 4 +--- rigs/kit/rs_hfiq.c | 4 +--- rigs/kit/si570avrusb.c | 4 +--- rigs/kit/usrp.c | 4 +--- rigs/kit/usrp_impl.cc | 4 +--- rigs/lowe/Android.mk | 2 +- rigs/lowe/hf235.c | 4 +--- rigs/lowe/lowe.c | 4 +--- rigs/pcr/Android.mk | 2 +- rigs/pcr/pcr.c | 4 +--- rigs/pcr/pcr100.c | 4 +--- rigs/pcr/pcr1000.c | 4 +--- rigs/pcr/pcr1500.c | 4 +--- rigs/pcr/pcr2500.c | 4 +--- rigs/prm80/Android.mk | 2 +- rigs/prm80/prm80.c | 4 +--- rigs/prm80/prm8060.c | 4 +--- rigs/racal/Android.mk | 2 +- rigs/racal/ra3702.c | 4 +--- rigs/racal/ra37xx.c | 4 +--- rigs/racal/ra6790.c | 4 +--- rigs/racal/racal.c | 4 +--- rigs/rft/Android.mk | 2 +- rigs/rft/ekd500.c | 4 +--- rigs/rft/rft.c | 4 +--- rigs/rs/Android.mk | 2 +- rigs/rs/eb200.c | 4 +--- rigs/rs/esmc.c | 4 +--- rigs/rs/gp2000.c | 4 +--- rigs/rs/rs.c | 4 +--- rigs/rs/xk2100.c | 4 +--- rigs/skanti/Android.mk | 2 +- rigs/skanti/skanti.c | 4 +--- rigs/skanti/trp8000.c | 4 +--- rigs/skanti/trp8255.c | 4 +--- rigs/tapr/Android.mk | 2 +- rigs/tapr/dsp10.c | 4 +--- rigs/tapr/tapr.c | 4 +--- rigs/tentec/Android.mk | 2 +- rigs/tentec/argonaut.c | 4 +--- rigs/tentec/jupiter.c | 4 +--- rigs/tentec/omnivii.c | 4 +--- rigs/tentec/orion.c | 4 +--- rigs/tentec/paragon.c | 4 +--- rigs/tentec/pegasus.c | 4 +--- rigs/tentec/rx320.c | 4 +--- rigs/tentec/rx331.c | 4 +--- rigs/tentec/rx340.c | 4 +--- rigs/tentec/rx350.c | 4 +--- rigs/tentec/tentec.c | 4 +--- rigs/tentec/tentec2.c | 4 +--- rigs/tentec/tt550.c | 4 +--- rigs/tuner/Android.mk | 2 +- rigs/uniden/Android.mk | 2 +- rigs/uniden/bc245.c | 4 +--- rigs/uniden/bc250.c | 4 +--- rigs/uniden/bc780.c | 4 +--- rigs/uniden/bc895.c | 4 +--- rigs/uniden/bc898.c | 4 +--- rigs/uniden/bcd396t.c | 4 +--- rigs/uniden/bcd996t.c | 4 +--- rigs/uniden/pro2052.c | 4 +--- rigs/uniden/uniden.c | 4 +--- rigs/uniden/uniden_digital.c | 4 +--- rigs/winradio/Android.mk | 2 +- rigs/wj/Android.mk | 2 +- rigs/wj/wj.c | 4 +--- rigs/wj/wj8888.c | 4 +--- rigs/yaesu/Android.mk | 2 +- rigs/yaesu/frg100.c | 4 +--- rigs/yaesu/frg8800.c | 4 +--- rigs/yaesu/frg9600.c | 4 +--- rigs/yaesu/ft100.c | 4 +--- rigs/yaesu/ft1000d.c | 4 +--- rigs/yaesu/ft1000mp.c | 4 +--- rigs/yaesu/ft1200.c | 4 +--- rigs/yaesu/ft2000.c | 4 +--- rigs/yaesu/ft3000.c | 4 +--- rigs/yaesu/ft450.c | 4 +--- rigs/yaesu/ft5000.c | 4 +--- rigs/yaesu/ft600.c | 4 +--- rigs/yaesu/ft736.c | 4 +--- rigs/yaesu/ft747.c | 4 +--- rigs/yaesu/ft757gx.c | 4 +--- rigs/yaesu/ft767gx.c | 4 +--- rigs/yaesu/ft817.c | 4 +--- rigs/yaesu/ft840.c | 4 +--- rigs/yaesu/ft847.c | 4 +--- rigs/yaesu/ft857.c | 4 +--- rigs/yaesu/ft890.c | 4 +--- rigs/yaesu/ft891.c | 4 +--- rigs/yaesu/ft897.c | 4 +--- rigs/yaesu/ft900.c | 4 +--- rigs/yaesu/ft9000.c | 4 +--- rigs/yaesu/ft920.c | 4 +--- rigs/yaesu/ft950.c | 4 +--- rigs/yaesu/ft980.c | 4 +--- rigs/yaesu/ft990.c | 4 +--- rigs/yaesu/ft991.c | 4 +--- rigs/yaesu/ftdx10.c | 4 +--- rigs/yaesu/ftdx101.c | 4 +--- rigs/yaesu/ftdx101mp.c | 4 +--- rigs/yaesu/newcat.c | 4 +--- rigs/yaesu/vr5000.c | 4 +--- rigs/yaesu/vx1700.c | 4 +--- rigs/yaesu/yaesu.c | 4 +--- rotators/amsat/Android.mk | 2 +- rotators/amsat/if100.c | 4 +--- rotators/androidsensor/Android.mk | 2 +- rotators/androidsensor/androidsensor.cpp | 4 +--- rotators/ars/Android.mk | 2 +- rotators/ars/ars.c | 4 +--- rotators/celestron/Android.mk | 2 +- rotators/celestron/celestron.c | 4 +--- rotators/cnctrk/Android.mk | 2 +- rotators/cnctrk/cnctrk.c | 4 +--- rotators/easycomm/Android.mk | 2 +- rotators/easycomm/easycomm.c | 4 +--- rotators/ether6/Android.mk | 2 +- rotators/ether6/ether6.c | 4 +--- rotators/fodtrack/Android.mk | 2 +- rotators/fodtrack/fodtrack.c | 4 +--- rotators/gs232a/Android.mk | 2 +- rotators/gs232a/gs232.c | 4 +--- rotators/gs232a/gs232a.c | 4 +--- rotators/gs232a/gs232b.c | 4 +--- rotators/heathkit/Android.mk | 2 +- rotators/heathkit/hd1780.c | 4 +--- rotators/indi/Android.mk | 2 +- rotators/indi/indi.c | 4 +--- rotators/ioptron/Android.mk | 2 +- rotators/ioptron/rot_ioptron.c | 4 +--- rotators/m2/Android.mk | 2 +- rotators/m2/rc2800.c | 4 +--- rotators/meade/Android.mk | 4 ++-- rotators/meade/meade.c | 4 +--- rotators/prosistel/Android.mk | 2 +- rotators/prosistel/prosistel.c | 4 +--- rotators/radant/Android.mk | 2 +- rotators/radant/radant.c | 4 +--- rotators/rotorez/Android.mk | 2 +- rotators/rotorez/rotorez.c | 4 +--- rotators/sartek/Android.mk | 2 +- rotators/sartek/sartek.c | 4 +--- rotators/satel/Android.mk | 2 +- rotators/satel/satel.c | 4 +--- rotators/spid/Android.mk | 2 +- rotators/spid/spid.c | 4 +--- rotators/ts7400/Android.mk | 2 +- rotators/ts7400/ts7400.c | 4 +--- src/Android.mk | 2 +- src/amp_conf.c | 4 +--- src/amp_reg.c | 4 +--- src/amp_settings.c | 4 +--- src/amplifier.c | 4 +--- src/cal.c | 4 +--- src/cm108.c | 4 +--- src/conf.c | 4 +--- src/debug.c | 4 +--- src/event.c | 4 +--- src/ext.c | 4 +--- src/extamp.c | 4 +--- src/iofunc.c | 4 +--- src/locator.c | 4 +--- src/mem.c | 4 +--- src/microham.c | 4 +--- src/misc.c | 4 +--- src/network.c | 4 +--- src/parallel.c | 4 +--- src/register.c | 4 +--- src/rot_conf.c | 4 +--- src/rot_ext.c | 4 +--- src/rot_reg.c | 4 +--- src/rot_settings.c | 4 +--- src/rotator.c | 4 +--- src/serial.c | 4 +--- src/settings.c | 4 +--- src/snapshot_data.c | 4 +--- src/sprintflst.c | 4 +--- src/tones.c | 4 +--- src/usb_port.c | 4 +--- tests/Android.mk | 4 ++-- tests/ampctl.c | 4 +--- tests/ampctl_parse.c | 4 +--- tests/ampctld.c | 4 +--- tests/dumpcaps.c | 4 +--- tests/dumpcaps_amp.c | 4 +--- tests/dumpcaps_rot.c | 4 +--- tests/dumpmem.c | 4 +--- tests/memcsv.c | 4 +--- tests/rigctl.c | 4 +--- tests/rigctl_parse.c | 4 +--- tests/rigctlcom.c | 4 +--- tests/rigctld.c | 4 +--- tests/rigmem.c | 4 +--- tests/rigsmtr.c | 4 +--- tests/rigswr.c | 4 +--- tests/rotctl.c | 4 +--- tests/rotctl_parse.c | 4 +--- tests/rotctld.c | 4 +--- tests/testbcd.c | 4 +--- tests/testfreq.c | 4 +--- tests/testrig.c | 4 +--- tests/testrigopen.c | 4 +--- tests/testtrn.c | 4 +--- 407 files changed, 408 insertions(+), 1113 deletions(-) diff --git a/amplifiers/elecraft/Android.mk b/amplifiers/elecraft/Android.mk index 44cea9eaf..5bba428b0 100644 --- a/amplifiers/elecraft/Android.mk +++ b/amplifiers/elecraft/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := elecraft.c kpa.c kpa1500.c LOCAL_MODULE := elecraft -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib diff --git a/amplifiers/elecraft/kpa1500.c b/amplifiers/elecraft/kpa1500.c index ea3b27750..c748e1589 100644 --- a/amplifiers/elecraft/kpa1500.c +++ b/amplifiers/elecraft/kpa1500.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* Standard library definitions */ diff --git a/bindings/hamlib.swg b/bindings/hamlib.swg index 317ffa5fb..05284c282 100644 --- a/bindings/hamlib.swg +++ b/bindings/hamlib.swg @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/c++/ampclass.cc b/c++/ampclass.cc index 4f2e0c6d7..de7519eb1 100644 --- a/c++/ampclass.cc +++ b/c++/ampclass.cc @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include //#include #include diff --git a/c++/rigclass.cc b/c++/rigclass.cc index ad778e814..2cf951a49 100644 --- a/c++/rigclass.cc +++ b/c++/rigclass.cc @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/c++/rotclass.cc b/c++/rotclass.cc index d1678e15e..442776b44 100644 --- a/c++/rotclass.cc +++ b/c++/rotclass.cc @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/cppcheck.sh b/cppcheck.sh index d71b45ba9..6021f6884 100755 --- a/cppcheck.sh +++ b/cppcheck.sh @@ -46,7 +46,6 @@ SUPPRESS="\ CHECK="\ -Duint64_t \ --D HAVE_CONFIG_H \ -D HAMLIB_EXPORT \ -D HAMLIB_EXPORT_VAR \ -D __WORDSIZE \ diff --git a/extra/gnuradio/gnuradio.cc b/extra/gnuradio/gnuradio.cc index 5fdc97ae9..64bd13765 100644 --- a/extra/gnuradio/gnuradio.cc +++ b/extra/gnuradio/gnuradio.cc @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include /* * Simple backend of a chirp source. diff --git a/extra/gnuradio/gr.c b/extra/gnuradio/gr.c index e5a85cbf8..9c937adca 100644 --- a/extra/gnuradio/gr.c +++ b/extra/gnuradio/gr.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/extra/gnuradio/graudio.c b/extra/gnuradio/graudio.c index 0a54ac3c6..74e6f5304 100644 --- a/extra/gnuradio/graudio.c +++ b/extra/gnuradio/graudio.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/extra/gnuradio/mc4020.c b/extra/gnuradio/mc4020.c index 47355f43c..68917103c 100644 --- a/extra/gnuradio/mc4020.c +++ b/extra/gnuradio/mc4020.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/lib/asyncpipe.c b/lib/asyncpipe.c index 2e362230d..519a7c787 100644 --- a/lib/asyncpipe.c +++ b/lib/asyncpipe.c @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "asyncpipe.h" diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index d40e17c0a..0797ec3fc 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -22,9 +22,7 @@ /* Forcing WINVER in MinGW yanks in getaddrinfo(), but locks out Win95/Win98 */ /* #define WINVER 0x0501 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/lib/getopt.c b/lib/getopt.c index 6561a58d7..295733ec1 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -22,9 +22,7 @@ */ /* NOTE!!! AIX requires this to be the first thing in the file. Do not put ANYTHING before it! */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #if !__STDC__ && !defined(const) && IN_GCC #define const diff --git a/lib/getopt_long.c b/lib/getopt_long.c index e42782f27..064e189cf 100644 --- a/lib/getopt_long.c +++ b/lib/getopt_long.c @@ -17,9 +17,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "getopt.h" diff --git a/rigs/adat/Android.mk b/rigs/adat/Android.mk index f78798292..f09de3b5b 100644 --- a/rigs/adat/Android.mk +++ b/rigs/adat/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := adat.c adt_200a.c LOCAL_MODULE := adat -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := $(LOCAL_SHARED_LIBRARIES) -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c index daa0dae81..621a721a7 100644 --- a/rigs/adat/adat.c +++ b/rigs/adat/adat.c @@ -21,9 +21,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include // --------------------------------------------------------------------------- // SYSTEM INCLUDES diff --git a/rigs/adat/adt_200a.c b/rigs/adat/adt_200a.c index d8de1f09d..a1052fe1f 100644 --- a/rigs/adat/adt_200a.c +++ b/rigs/adat/adt_200a.c @@ -22,9 +22,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include // --------------------------------------------------------------------------- // ADT-200A INCLUDES diff --git a/rigs/alinco/Android.mk b/rigs/alinco/Android.mk index e3c64ab06..db4852477 100644 --- a/rigs/alinco/Android.mk +++ b/rigs/alinco/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := dx77.c alinco.c dxsr8.c LOCAL_MODULE := alinco -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/alinco/alinco.c b/rigs/alinco/alinco.c index 5537ffd93..449acd441 100644 --- a/rigs/alinco/alinco.c +++ b/rigs/alinco/alinco.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c index 11d9505ab..b185b26bc 100644 --- a/rigs/alinco/dx77.c +++ b/rigs/alinco/dx77.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/rigs/alinco/dxsr8.c b/rigs/alinco/dxsr8.c index b6211cc63..57409ab05 100644 --- a/rigs/alinco/dxsr8.c +++ b/rigs/alinco/dxsr8.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/aor/Android.mk b/rigs/aor/Android.mk index 08ed00cad..5d741bb22 100644 --- a/rigs/aor/Android.mk +++ b/rigs/aor/Android.mk @@ -6,7 +6,7 @@ LOCAL_SRC_FILES := ar8200.c ar8000.c ar5000.c ar3000.c ar7030.c ar3030.c \ ar2700.c ar8600.c ar7030p.c ar7030p_utils.c sr2200.c aor.c LOCAL_MODULE := aor -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c index 1d7b3fa89..8380134ae 100644 --- a/rigs/aor/aor.c +++ b/rigs/aor/aor.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/aor/ar2700.c b/rigs/aor/ar2700.c index 531dce1c0..ddc6136bb 100644 --- a/rigs/aor/ar2700.c +++ b/rigs/aor/ar2700.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/aor/ar3000.c b/rigs/aor/ar3000.c index 8a8e2e8d7..ea08828bb 100644 --- a/rigs/aor/ar3000.c +++ b/rigs/aor/ar3000.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/aor/ar3030.c b/rigs/aor/ar3030.c index 4af52e14f..3c7854414 100644 --- a/rigs/aor/ar3030.c +++ b/rigs/aor/ar3030.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/aor/ar5000.c b/rigs/aor/ar5000.c index 4b178383f..70e817140 100644 --- a/rigs/aor/ar5000.c +++ b/rigs/aor/ar5000.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c index 5ef47d390..8b1a98203 100644 --- a/rigs/aor/ar7030.c +++ b/rigs/aor/ar7030.c @@ -24,9 +24,7 @@ // Version 2004.11.29 F.Melchert (DC9RP) // -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c index 2b5eaa25b..9f354b2b0 100644 --- a/rigs/aor/ar7030p.c +++ b/rigs/aor/ar7030p.c @@ -24,9 +24,7 @@ * Version 2009.11.21 Larry Gadallah (VE6VQ) */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/aor/ar8000.c b/rigs/aor/ar8000.c index 2a26fb376..57035228f 100644 --- a/rigs/aor/ar8000.c +++ b/rigs/aor/ar8000.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/aor/ar8200.c b/rigs/aor/ar8200.c index 85eb42415..f72e3c057 100644 --- a/rigs/aor/ar8200.c +++ b/rigs/aor/ar8200.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/aor/ar8600.c b/rigs/aor/ar8600.c index 63c91fc2f..bfe062331 100644 --- a/rigs/aor/ar8600.c +++ b/rigs/aor/ar8600.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c index cb51cd098..d39444b2b 100644 --- a/rigs/aor/sr2200.c +++ b/rigs/aor/sr2200.c @@ -21,9 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/barrett/4050.c b/rigs/barrett/4050.c index b840ffc88..b637d22df 100644 --- a/rigs/barrett/4050.c +++ b/rigs/barrett/4050.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c index 901b670e0..c19d38593 100644 --- a/rigs/barrett/950.c +++ b/rigs/barrett/950.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/rigs/barrett/Android.mk b/rigs/barrett/Android.mk index 658ef13f0..30549896e 100644 --- a/rigs/barrett/Android.mk +++ b/rigs/barrett/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := barrett.c barrett.h 950.c LOCAL_MODULE := barrett -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c index d5c4d8a29..17a04bd48 100644 --- a/rigs/barrett/barrett.c +++ b/rigs/barrett/barrett.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/rigs/codan/Android.mk b/rigs/codan/Android.mk index b4bc24c53..dc16b653f 100644 --- a/rigs/codan/Android.mk +++ b/rigs/codan/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := codan.c codan.h LOCAL_MODULE := codan -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/codan/codan.c b/rigs/codan/codan.c index adbe38c4f..c7443f099 100644 --- a/rigs/codan/codan.c +++ b/rigs/codan/codan.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/rigs/dorji/Android.mk b/rigs/dorji/Android.mk index 1494e3414..c766067d4 100644 --- a/rigs/dorji/Android.mk +++ b/rigs/dorji/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := dorji.c dra818.c LOCAL_MODULE := dorji -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/dorji/dorji.c b/rigs/dorji/dorji.c index d43a58eac..6e47edcb0 100644 --- a/rigs/dorji/dorji.c +++ b/rigs/dorji/dorji.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/dorji/dra818.c b/rigs/dorji/dra818.c index 389fee87b..c249de00b 100644 --- a/rigs/dorji/dra818.c +++ b/rigs/dorji/dra818.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/drake/Android.mk b/rigs/drake/Android.mk index 75d91ff7d..96a220846 100644 --- a/rigs/drake/Android.mk +++ b/rigs/drake/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := r8a.c r8b.c drake.c LOCAL_MODULE := drake -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/drake/drake.c b/rigs/drake/drake.c index 456c44740..9a2f28738 100644 --- a/rigs/drake/drake.c +++ b/rigs/drake/drake.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/drake/r8a.c b/rigs/drake/r8a.c index aa173514d..68f7404a3 100644 --- a/rigs/drake/r8a.c +++ b/rigs/drake/r8a.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/drake/r8b.c b/rigs/drake/r8b.c index 65d3710ab..ff8cb1a9f 100644 --- a/rigs/drake/r8b.c +++ b/rigs/drake/r8b.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/dummy/Android.mk b/rigs/dummy/Android.mk index aebc5c9e3..840544658 100644 --- a/rigs/dummy/Android.mk +++ b/rigs/dummy/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := dummy.c rot_dummy.c netrigctl.c netrotctl.c flrig.c trxmanager.c dummy_common.c LOCAL_MODULE := dummy -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/dummy/amp_dummy.c b/rigs/dummy/amp_dummy.c index 307f9aa83..9f529d459 100644 --- a/rigs/dummy/amp_dummy.c +++ b/rigs/dummy/amp_dummy.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c index d4a430d5b..33c42df87 100644 --- a/rigs/dummy/dummy.c +++ b/rigs/dummy/dummy.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include // cppcheck-suppress * #include diff --git a/rigs/dummy/dummy_common.c b/rigs/dummy/dummy_common.c index 31de9fee6..9a4153d55 100644 --- a/rigs/dummy/dummy_common.c +++ b/rigs/dummy/dummy_common.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include // cppcheck-suppress * #include diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c index cc0124f18..46e0470c6 100644 --- a/rigs/dummy/flrig.c +++ b/rigs/dummy/flrig.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/dummy/netampctl.c b/rigs/dummy/netampctl.c index 12279fe41..fc351bb03 100644 --- a/rigs/dummy/netampctl.c +++ b/rigs/dummy/netampctl.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c index c4b519bd6..d45e54296 100644 --- a/rigs/dummy/netrigctl.c +++ b/rigs/dummy/netrigctl.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/dummy/netrotctl.c b/rigs/dummy/netrotctl.c index 408721e3d..08e900b01 100644 --- a/rigs/dummy/netrotctl.c +++ b/rigs/dummy/netrotctl.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/dummy/rot_dummy.c b/rigs/dummy/rot_dummy.c index be09a9c62..67cce62f8 100644 --- a/rigs/dummy/rot_dummy.c +++ b/rigs/dummy/rot_dummy.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/dummy/tci1x.c b/rigs/dummy/tci1x.c index 36357011a..10ab84f23 100644 --- a/rigs/dummy/tci1x.c +++ b/rigs/dummy/tci1x.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/dummy/trxmanager.c b/rigs/dummy/trxmanager.c index 1a2a4fa1c..3a5fe7eb0 100644 --- a/rigs/dummy/trxmanager.c +++ b/rigs/dummy/trxmanager.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/elad/Android.mk b/rigs/elad/Android.mk index 81e393e26..acda8e649 100644 --- a/rigs/elad/Android.mk +++ b/rigs/elad/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := elad.c fdm_duo.c LOCAL_MODULE := elad -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/elad/elad.c b/rigs/elad/elad.c index 36c99d6e2..599ef081b 100644 --- a/rigs/elad/elad.c +++ b/rigs/elad/elad.c @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/elad/fdm_duo.c b/rigs/elad/fdm_duo.c index 66fed5854..a052388ba 100644 --- a/rigs/elad/fdm_duo.c +++ b/rigs/elad/fdm_duo.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/flexradio/Android.mk b/rigs/flexradio/Android.mk index 5751e4a2f..08711ae42 100644 --- a/rigs/flexradio/Android.mk +++ b/rigs/flexradio/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := flexradio.c sdr1k.c dttsp.c LOCAL_MODULE := flexradio -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/flexradio/dttsp.c b/rigs/flexradio/dttsp.c index f6d3be017..c6bcc456a 100644 --- a/rigs/flexradio/dttsp.c +++ b/rigs/flexradio/dttsp.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/rigs/flexradio/flexradio.c b/rigs/flexradio/flexradio.c index 31f3d79ba..d4dd1bf22 100644 --- a/rigs/flexradio/flexradio.c +++ b/rigs/flexradio/flexradio.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/flexradio/sdr1k.c b/rigs/flexradio/sdr1k.c index d06dc3ad1..659d4c28a 100644 --- a/rigs/flexradio/sdr1k.c +++ b/rigs/flexradio/sdr1k.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/icmarine/Android.mk b/rigs/icmarine/Android.mk index 0cfc41d8c..b3714f262 100644 --- a/rigs/icmarine/Android.mk +++ b/rigs/icmarine/Android.mk @@ -6,7 +6,7 @@ LOCAL_SRC_FILES := icm700pro.c icm710.c icm802.c icm803.c \ icmarine.c LOCAL_MODULE := icmarine -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/icmarine/icm700pro.c b/rigs/icmarine/icm700pro.c index 55b5f74f1..586360182 100644 --- a/rigs/icmarine/icm700pro.c +++ b/rigs/icmarine/icm700pro.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icmarine/icm710.c b/rigs/icmarine/icm710.c index 863af0276..3e3b516e4 100644 --- a/rigs/icmarine/icm710.c +++ b/rigs/icmarine/icm710.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/icmarine/icm802.c b/rigs/icmarine/icm802.c index b39b5f10e..aedc69c53 100644 --- a/rigs/icmarine/icm802.c +++ b/rigs/icmarine/icm802.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icmarine/icm803.c b/rigs/icmarine/icm803.c index 4daea7843..238511148 100644 --- a/rigs/icmarine/icm803.c +++ b/rigs/icmarine/icm803.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icmarine/icmarine.c b/rigs/icmarine/icmarine.c index 5942846f5..692a44cd3 100644 --- a/rigs/icmarine/icmarine.c +++ b/rigs/icmarine/icmarine.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/icom/Android.mk b/rigs/icom/Android.mk index 0440f8492..7951dbd4a 100644 --- a/rigs/icom/Android.mk +++ b/rigs/icom/Android.mk @@ -16,7 +16,7 @@ LOCAL_SRC_FILES := ic706.c icr8500.c ic735.c ic775.c ic756.c \ id31.c icr8600.c ic7300.c ic7610.c icr30.c ic785x.c LOCAL_MODULE := icom -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/icom/delta2.c b/rigs/icom/delta2.c index 2f60c5d65..8e487c3cf 100644 --- a/rigs/icom/delta2.c +++ b/rigs/icom/delta2.c @@ -31,9 +31,7 @@ * To Do: get the datasheet, and testing on real hardware!! */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c index 1ee6bcad5..f231d5e5a 100644 --- a/rigs/icom/frame.c +++ b/rigs/icom/frame.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include /* String function definitions */ diff --git a/rigs/icom/ic1275.c b/rigs/icom/ic1275.c index b5bb39194..222a260ce 100644 --- a/rigs/icom/ic1275.c +++ b/rigs/icom/ic1275.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic271.c b/rigs/icom/ic271.c index 4083d2c97..d5b9c03d8 100644 --- a/rigs/icom/ic271.c +++ b/rigs/icom/ic271.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic2730.c b/rigs/icom/ic2730.c index dc70c878a..14f854a81 100644 --- a/rigs/icom/ic2730.c +++ b/rigs/icom/ic2730.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic275.c b/rigs/icom/ic275.c index 3cbbc2b4d..710b76337 100644 --- a/rigs/icom/ic275.c +++ b/rigs/icom/ic275.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic471.c b/rigs/icom/ic471.c index 8d0647a7f..9bb9425a3 100644 --- a/rigs/icom/ic471.c +++ b/rigs/icom/ic471.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic475.c b/rigs/icom/ic475.c index 62b89c5fd..a33976f18 100644 --- a/rigs/icom/ic475.c +++ b/rigs/icom/ic475.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic7000.c b/rigs/icom/ic7000.c index 5ff02c298..9da9868cc 100644 --- a/rigs/icom/ic7000.c +++ b/rigs/icom/ic7000.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include /* String function definitions */ diff --git a/rigs/icom/ic703.c b/rigs/icom/ic703.c index 11c382ac0..a913bd2df 100644 --- a/rigs/icom/ic703.c +++ b/rigs/icom/ic703.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic706.c b/rigs/icom/ic706.c index 67db35294..f96a65664 100644 --- a/rigs/icom/ic706.c +++ b/rigs/icom/ic706.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic707.c b/rigs/icom/ic707.c index 381f47c81..4590b4d06 100644 --- a/rigs/icom/ic707.c +++ b/rigs/icom/ic707.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c index 708c983af..2b32f1a1b 100644 --- a/rigs/icom/ic7100.c +++ b/rigs/icom/ic7100.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic718.c b/rigs/icom/ic718.c index 1c6a5ce21..435f8bce8 100644 --- a/rigs/icom/ic718.c +++ b/rigs/icom/ic718.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c index 6eb49867b..3040a8214 100644 --- a/rigs/icom/ic7200.c +++ b/rigs/icom/ic7200.c @@ -24,9 +24,7 @@ * 25Mar09: Initial release */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/icom/ic725.c b/rigs/icom/ic725.c index 2ffa6e0c4..ab700f42f 100644 --- a/rigs/icom/ic725.c +++ b/rigs/icom/ic725.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic726.c b/rigs/icom/ic726.c index 7e399b63b..5eb9de93d 100644 --- a/rigs/icom/ic726.c +++ b/rigs/icom/ic726.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic728.c b/rigs/icom/ic728.c index 2b2617b2b..dc1cc8807 100644 --- a/rigs/icom/ic728.c +++ b/rigs/icom/ic728.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c index b956186d5..a5b1a861f 100644 --- a/rigs/icom/ic7300.c +++ b/rigs/icom/ic7300.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/icom/ic735.c b/rigs/icom/ic735.c index 316071db4..68730709c 100644 --- a/rigs/icom/ic735.c +++ b/rigs/icom/ic735.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic736.c b/rigs/icom/ic736.c index 88cc64376..709ca0702 100644 --- a/rigs/icom/ic736.c +++ b/rigs/icom/ic736.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic737.c b/rigs/icom/ic737.c index ef7955ba0..87b191923 100644 --- a/rigs/icom/ic737.c +++ b/rigs/icom/ic737.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic738.c b/rigs/icom/ic738.c index b15bc52d9..c4154ad93 100644 --- a/rigs/icom/ic738.c +++ b/rigs/icom/ic738.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic7410.c b/rigs/icom/ic7410.c index 34244d43d..fec138a07 100644 --- a/rigs/icom/ic7410.c +++ b/rigs/icom/ic7410.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c index c5dda0d2c..a984c3fd1 100644 --- a/rigs/icom/ic746.c +++ b/rigs/icom/ic746.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/icom/ic751.c b/rigs/icom/ic751.c index 9e59a590e..ae79628f3 100644 --- a/rigs/icom/ic751.c +++ b/rigs/icom/ic751.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c index 5352652ff..0d8fe6480 100644 --- a/rigs/icom/ic756.c +++ b/rigs/icom/ic756.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include /* String function definitions */ diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c index b6e90918c..a7bbab916 100644 --- a/rigs/icom/ic7600.c +++ b/rigs/icom/ic7600.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/icom/ic761.c b/rigs/icom/ic761.c index 0e49dfcaa..b3de8c1cc 100644 --- a/rigs/icom/ic761.c +++ b/rigs/icom/ic761.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic7610.c b/rigs/icom/ic7610.c index f9a747e31..fedcab605 100644 --- a/rigs/icom/ic7610.c +++ b/rigs/icom/ic7610.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/icom/ic765.c b/rigs/icom/ic765.c index 1141c15f8..b0203d72e 100644 --- a/rigs/icom/ic765.c +++ b/rigs/icom/ic765.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c index 593c21345..e2b3f7da1 100644 --- a/rigs/icom/ic7700.c +++ b/rigs/icom/ic7700.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/icom/ic775.c b/rigs/icom/ic775.c index 1c06c4d7f..730f3b196 100644 --- a/rigs/icom/ic775.c +++ b/rigs/icom/ic775.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic78.c b/rigs/icom/ic78.c index 2c3d1769a..1db921874 100644 --- a/rigs/icom/ic78.c +++ b/rigs/icom/ic78.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic7800.c b/rigs/icom/ic7800.c index bd7e76861..e0a5c9484 100644 --- a/rigs/icom/ic7800.c +++ b/rigs/icom/ic7800.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include /* String function definitions */ #include diff --git a/rigs/icom/ic781.c b/rigs/icom/ic781.c index f3872d599..c801e013f 100644 --- a/rigs/icom/ic781.c +++ b/rigs/icom/ic781.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c index e70280340..ba188da69 100644 --- a/rigs/icom/ic785x.c +++ b/rigs/icom/ic785x.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include /* String function definitions */ diff --git a/rigs/icom/ic820h.c b/rigs/icom/ic820h.c index 647d518f9..e6e8a7cb9 100644 --- a/rigs/icom/ic820h.c +++ b/rigs/icom/ic820h.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic821h.c b/rigs/icom/ic821h.c index 66f8ef278..6c47c2a95 100644 --- a/rigs/icom/ic821h.c +++ b/rigs/icom/ic821h.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic910.c b/rigs/icom/ic910.c index 970e68e05..511718caf 100644 --- a/rigs/icom/ic910.c +++ b/rigs/icom/ic910.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic9100.c b/rigs/icom/ic9100.c index 45a0471a5..d8be7605c 100644 --- a/rigs/icom/ic9100.c +++ b/rigs/icom/ic9100.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic92d.c b/rigs/icom/ic92d.c index 048dbc479..69e3687ab 100644 --- a/rigs/icom/ic92d.c +++ b/rigs/icom/ic92d.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/ic970.c b/rigs/icom/ic970.c index a6164854f..72ed289ae 100644 --- a/rigs/icom/ic970.c +++ b/rigs/icom/ic970.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icf8101.c b/rigs/icom/icf8101.c index 173201039..6d3d32451 100644 --- a/rigs/icom/icf8101.c +++ b/rigs/icom/icf8101.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 514608ee3..d457e38ad 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include // cppcheck-suppress * #include diff --git a/rigs/icom/icr10.c b/rigs/icom/icr10.c index 715c7a4e5..fd4e0e431 100644 --- a/rigs/icom/icr10.c +++ b/rigs/icom/icr10.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr20.c b/rigs/icom/icr20.c index 38bbe332b..c640fdcae 100644 --- a/rigs/icom/icr20.c +++ b/rigs/icom/icr20.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr30.c b/rigs/icom/icr30.c index 17b9f7d25..aacd67468 100644 --- a/rigs/icom/icr30.c +++ b/rigs/icom/icr30.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr6.c b/rigs/icom/icr6.c index 8880b6933..168ee8da1 100644 --- a/rigs/icom/icr6.c +++ b/rigs/icom/icr6.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr7000.c b/rigs/icom/icr7000.c index 784d20cbe..80200503b 100644 --- a/rigs/icom/icr7000.c +++ b/rigs/icom/icr7000.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr71.c b/rigs/icom/icr71.c index bfa7e7fcd..1c2740478 100644 --- a/rigs/icom/icr71.c +++ b/rigs/icom/icr71.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr72.c b/rigs/icom/icr72.c index 1df5edc78..dce87f152 100644 --- a/rigs/icom/icr72.c +++ b/rigs/icom/icr72.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr75.c b/rigs/icom/icr75.c index a627df8a7..1fa92c35b 100644 --- a/rigs/icom/icr75.c +++ b/rigs/icom/icr75.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/icom/icr8500.c b/rigs/icom/icr8500.c index c40b2ceea..777d9c907 100644 --- a/rigs/icom/icr8500.c +++ b/rigs/icom/icr8500.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr8600.c b/rigs/icom/icr8600.c index 8671efa93..41f3b2094 100644 --- a/rigs/icom/icr8600.c +++ b/rigs/icom/icr8600.c @@ -21,9 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "idx_builtin.h" diff --git a/rigs/icom/icr9000.c b/rigs/icom/icr9000.c index 4675346f0..917cc3916 100644 --- a/rigs/icom/icr9000.c +++ b/rigs/icom/icr9000.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icr9500.c b/rigs/icom/icr9500.c index 50a5db6bb..3f11a7203 100644 --- a/rigs/icom/icr9500.c +++ b/rigs/icom/icr9500.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/icrx7.c b/rigs/icom/icrx7.c index d355fdc52..1edef271b 100644 --- a/rigs/icom/icrx7.c +++ b/rigs/icom/icrx7.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/id1.c b/rigs/icom/id1.c index dc232e39f..f49016f41 100644 --- a/rigs/icom/id1.c +++ b/rigs/icom/id1.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/id31.c b/rigs/icom/id31.c index 238be5db1..660a8cf20 100644 --- a/rigs/icom/id31.c +++ b/rigs/icom/id31.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/id4100.c b/rigs/icom/id4100.c index 3286a2835..9ba02d5f7 100644 --- a/rigs/icom/id4100.c +++ b/rigs/icom/id4100.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/id51.c b/rigs/icom/id51.c index 47a02aed0..d415e2bf6 100644 --- a/rigs/icom/id51.c +++ b/rigs/icom/id51.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/id5100.c b/rigs/icom/id5100.c index 4c58014c4..c9228e28a 100644 --- a/rigs/icom/id5100.c +++ b/rigs/icom/id5100.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/omni.c b/rigs/icom/omni.c index b2053c4c1..fb3316a29 100644 --- a/rigs/icom/omni.c +++ b/rigs/icom/omni.c @@ -30,9 +30,7 @@ * Implement vfo split, FSK mode */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/optoscan.c b/rigs/icom/optoscan.c index 5e24f702f..3990b79bc 100644 --- a/rigs/icom/optoscan.c +++ b/rigs/icom/optoscan.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/icom/os456.c b/rigs/icom/os456.c index f019ad6c2..2fc89786a 100644 --- a/rigs/icom/os456.c +++ b/rigs/icom/os456.c @@ -24,9 +24,7 @@ * Email: james (dot) m (dot) smith (at) earthlink (dot) net */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/os535.c b/rigs/icom/os535.c index 9b40ad295..0cd35d389 100644 --- a/rigs/icom/os535.c +++ b/rigs/icom/os535.c @@ -24,9 +24,7 @@ * Email: james (dot) m (dot) smith (at) earthlink (dot) net */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/perseus.c b/rigs/icom/perseus.c index 2b8d80657..9c0d8cfe6 100644 --- a/rigs/icom/perseus.c +++ b/rigs/icom/perseus.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/icom/xiegu.c b/rigs/icom/xiegu.c index 9b93e9714..845ec8f65 100644 --- a/rigs/icom/xiegu.c +++ b/rigs/icom/xiegu.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/jrc/Android.mk b/rigs/jrc/Android.mk index f4f01f33d..7a5f0c4b1 100644 --- a/rigs/jrc/Android.mk +++ b/rigs/jrc/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := nrd535.c nrd545.c nrd525.c jrc.c LOCAL_MODULE := jrc -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/jrc/jrc.c b/rigs/jrc/jrc.c index f29ed3bc8..9854e25ec 100644 --- a/rigs/jrc/jrc.c +++ b/rigs/jrc/jrc.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/jrc/jst145.c b/rigs/jrc/jst145.c index edf049343..ab06bf744 100644 --- a/rigs/jrc/jst145.c +++ b/rigs/jrc/jst145.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/jrc/nrd525.c b/rigs/jrc/nrd525.c index 8d42067fa..139b9f3b0 100644 --- a/rigs/jrc/nrd525.c +++ b/rigs/jrc/nrd525.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/jrc/nrd535.c b/rigs/jrc/nrd535.c index e7527569b..19e520942 100644 --- a/rigs/jrc/nrd535.c +++ b/rigs/jrc/nrd535.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/jrc/nrd545.c b/rigs/jrc/nrd545.c index f2f546040..de75e41cc 100644 --- a/rigs/jrc/nrd545.c +++ b/rigs/jrc/nrd545.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kachina/505dsp.c b/rigs/kachina/505dsp.c index 67bdc965b..ccc654811 100644 --- a/rigs/kachina/505dsp.c +++ b/rigs/kachina/505dsp.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kachina/Android.mk b/rigs/kachina/Android.mk index a755e7f21..e66e76a9f 100644 --- a/rigs/kachina/Android.mk +++ b/rigs/kachina/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := 505dsp.c kachina.c LOCAL_MODULE := kachina -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/kachina/kachina.c b/rigs/kachina/kachina.c index 0a916054b..0c59d94ea 100644 --- a/rigs/kachina/kachina.c +++ b/rigs/kachina/kachina.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/kenwood/Android.mk b/rigs/kenwood/Android.mk index 44faf7527..28e3c39dc 100644 --- a/rigs/kenwood/Android.mk +++ b/rigs/kenwood/Android.mk @@ -11,7 +11,7 @@ LOCAL_SRC_FILES := ts850.c ts870s.c ts570.c ts450s.c ts950.c ts50s.c \ xg3.c thd74.c flex.c pihpsdr.c ts890s.c LOCAL_MODULE := kenwood -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c index 6c7ceeaab..013dc16bb 100644 --- a/rigs/kenwood/flex6xxx.c +++ b/rigs/kenwood/flex6xxx.c @@ -23,9 +23,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ic10.c b/rigs/kenwood/ic10.c index 6e3145bf9..259c2dd3a 100644 --- a/rigs/kenwood/ic10.c +++ b/rigs/kenwood/ic10.c @@ -21,9 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/k2.c b/rigs/kenwood/k2.c index e0eecba57..87181953f 100644 --- a/rigs/kenwood/k2.c +++ b/rigs/kenwood/k2.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c index 6c913888f..8a57c9ecd 100644 --- a/rigs/kenwood/k3.c +++ b/rigs/kenwood/k3.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c index 6ac75492c..72d5b0c5d 100644 --- a/rigs/kenwood/pihpsdr.c +++ b/rigs/kenwood/pihpsdr.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/r5000.c b/rigs/kenwood/r5000.c index 62ef5b031..4d2e51abe 100644 --- a/rigs/kenwood/r5000.c +++ b/rigs/kenwood/r5000.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c index 1177b0614..c9ff5fc07 100644 --- a/rigs/kenwood/th.c +++ b/rigs/kenwood/th.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/thd7.c b/rigs/kenwood/thd7.c index 27e7da821..703a9b13f 100644 --- a/rigs/kenwood/thd7.c +++ b/rigs/kenwood/thd7.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c index 0b68ce3e4..dc6090ee0 100644 --- a/rigs/kenwood/thd72.c +++ b/rigs/kenwood/thd72.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c index a71596088..4351c5d13 100644 --- a/rigs/kenwood/thd74.c +++ b/rigs/kenwood/thd74.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/thf6a.c b/rigs/kenwood/thf6a.c index c61534103..51ebf341f 100644 --- a/rigs/kenwood/thf6a.c +++ b/rigs/kenwood/thf6a.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/thf7.c b/rigs/kenwood/thf7.c index 08e599c31..f2f081059 100644 --- a/rigs/kenwood/thf7.c +++ b/rigs/kenwood/thf7.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/thg71.c b/rigs/kenwood/thg71.c index 6bf448dac..934961bbc 100644 --- a/rigs/kenwood/thg71.c +++ b/rigs/kenwood/thg71.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/tmd700.c b/rigs/kenwood/tmd700.c index bdd469d8f..e1275b1b2 100644 --- a/rigs/kenwood/tmd700.c +++ b/rigs/kenwood/tmd700.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c index 2bc32e5af..003698ea6 100644 --- a/rigs/kenwood/tmd710.c +++ b/rigs/kenwood/tmd710.c @@ -34,9 +34,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/tmv7.c b/rigs/kenwood/tmv7.c index 56029990e..3f20973ac 100644 --- a/rigs/kenwood/tmv7.c +++ b/rigs/kenwood/tmv7.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/transfox.c b/rigs/kenwood/transfox.c index da312fa4e..d54ba9193 100644 --- a/rigs/kenwood/transfox.c +++ b/rigs/kenwood/transfox.c @@ -21,9 +21,7 @@ * the complete text of the GNU Lesser Public License version 2.1. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/trc80.c b/rigs/kenwood/trc80.c index de098325e..132768b84 100644 --- a/rigs/kenwood/trc80.c +++ b/rigs/kenwood/trc80.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts140.c b/rigs/kenwood/ts140.c index d746b5a54..2310904e0 100644 --- a/rigs/kenwood/ts140.c +++ b/rigs/kenwood/ts140.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index e2cb12099..6f1809f7d 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ts440.c b/rigs/kenwood/ts440.c index fcc637f72..e9e44f66c 100644 --- a/rigs/kenwood/ts440.c +++ b/rigs/kenwood/ts440.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts450s.c b/rigs/kenwood/ts450s.c index ca302510a..7ea67faeb 100644 --- a/rigs/kenwood/ts450s.c +++ b/rigs/kenwood/ts450s.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c index 985d110e5..173e7237e 100644 --- a/rigs/kenwood/ts480.c +++ b/rigs/kenwood/ts480.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ts50s.c b/rigs/kenwood/ts50s.c index 2b33ee251..9ca60d269 100644 --- a/rigs/kenwood/ts50s.c +++ b/rigs/kenwood/ts50s.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts570.c b/rigs/kenwood/ts570.c index 545f4cde5..1437b0451 100644 --- a/rigs/kenwood/ts570.c +++ b/rigs/kenwood/ts570.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c index ed6bc87ed..c72ed31a0 100644 --- a/rigs/kenwood/ts590.c +++ b/rigs/kenwood/ts590.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ts680.c b/rigs/kenwood/ts680.c index 35d05b249..84a38eebc 100644 --- a/rigs/kenwood/ts680.c +++ b/rigs/kenwood/ts680.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ts690.c b/rigs/kenwood/ts690.c index b464bed4e..3651499c9 100644 --- a/rigs/kenwood/ts690.c +++ b/rigs/kenwood/ts690.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts711.c b/rigs/kenwood/ts711.c index eeb27f827..ceca42fa0 100644 --- a/rigs/kenwood/ts711.c +++ b/rigs/kenwood/ts711.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts790.c b/rigs/kenwood/ts790.c index a8b75d5e3..7120aec17 100644 --- a/rigs/kenwood/ts790.c +++ b/rigs/kenwood/ts790.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts811.c b/rigs/kenwood/ts811.c index 6f46b3dd2..3c0ae2dd8 100644 --- a/rigs/kenwood/ts811.c +++ b/rigs/kenwood/ts811.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts850.c b/rigs/kenwood/ts850.c index b66fa06b4..2f0b4b6a4 100644 --- a/rigs/kenwood/ts850.c +++ b/rigs/kenwood/ts850.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ts870s.c b/rigs/kenwood/ts870s.c index 2d1788606..23f7ea1fd 100644 --- a/rigs/kenwood/ts870s.c +++ b/rigs/kenwood/ts870s.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c index ffcc7b563..680041cce 100644 --- a/rigs/kenwood/ts890s.c +++ b/rigs/kenwood/ts890s.c @@ -18,9 +18,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts930.c b/rigs/kenwood/ts930.c index a4e4fce77..fb09991c6 100644 --- a/rigs/kenwood/ts930.c +++ b/rigs/kenwood/ts930.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts940.c b/rigs/kenwood/ts940.c index 4231da098..8d6ae3bfa 100644 --- a/rigs/kenwood/ts940.c +++ b/rigs/kenwood/ts940.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts950.c b/rigs/kenwood/ts950.c index 40540a394..d16333c3d 100644 --- a/rigs/kenwood/ts950.c +++ b/rigs/kenwood/ts950.c @@ -24,9 +24,7 @@ * The '950 has a relatively small command set. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c index 2fe7d85d7..3d206a4f1 100644 --- a/rigs/kenwood/ts990s.c +++ b/rigs/kenwood/ts990s.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/tx500.c b/rigs/kenwood/tx500.c index de086f4af..25f0e2ccf 100644 --- a/rigs/kenwood/tx500.c +++ b/rigs/kenwood/tx500.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kenwood/xg3.c b/rigs/kenwood/xg3.c index 2fb07a27b..0368d94dc 100644 --- a/rigs/kenwood/xg3.c +++ b/rigs/kenwood/xg3.c @@ -23,9 +23,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kit/Android.mk b/rigs/kit/Android.mk index 1bcd8c518..3333b0047 100644 --- a/rigs/kit/Android.mk +++ b/rigs/kit/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := elektor304.c drt1.c dwt.c usrp.c elektor507.c \ pcrotor.c kit.c rs_hfiq.c LOCAL_MODULE := kit -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/kit/dds60.c b/rigs/kit/dds60.c index e5c81a18a..7145fd80a 100644 --- a/rigs/kit/dds60.c +++ b/rigs/kit/dds60.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kit/drt1.c b/rigs/kit/drt1.c index 38d99f1da..a81f043e4 100644 --- a/rigs/kit/drt1.c +++ b/rigs/kit/drt1.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kit/dwt.c b/rigs/kit/dwt.c index 142bdd55b..9a2355b9c 100644 --- a/rigs/kit/dwt.c +++ b/rigs/kit/dwt.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kit/elektor304.c b/rigs/kit/elektor304.c index 92cb24cf0..9fca681a8 100644 --- a/rigs/kit/elektor304.c +++ b/rigs/kit/elektor304.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kit/elektor507.c b/rigs/kit/elektor507.c index 748319286..35c3e8210 100644 --- a/rigs/kit/elektor507.c +++ b/rigs/kit/elektor507.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kit/fifisdr.c b/rigs/kit/fifisdr.c index d2dd377e3..9dabbb166 100644 --- a/rigs/kit/fifisdr.c +++ b/rigs/kit/fifisdr.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #ifdef HAVE_STDINT_H #include diff --git a/rigs/kit/funcube.c b/rigs/kit/funcube.c index 1cbdea032..f2d5da2b6 100644 --- a/rigs/kit/funcube.c +++ b/rigs/kit/funcube.c @@ -23,9 +23,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #ifdef HAVE_STDINT_H #include diff --git a/rigs/kit/hiqsdr.c b/rigs/kit/hiqsdr.c index e50876bbd..5d52c2fad 100644 --- a/rigs/kit/hiqsdr.c +++ b/rigs/kit/hiqsdr.c @@ -17,9 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/rigs/kit/kit.c b/rigs/kit/kit.c index 1254efb10..fd66f8783 100644 --- a/rigs/kit/kit.c +++ b/rigs/kit/kit.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/kit/miniVNA.c b/rigs/kit/miniVNA.c index 77c4010a1..d4a32a084 100644 --- a/rigs/kit/miniVNA.c +++ b/rigs/kit/miniVNA.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kit/pcrotor.c b/rigs/kit/pcrotor.c index 16343f62f..a8aea6e09 100644 --- a/rigs/kit/pcrotor.c +++ b/rigs/kit/pcrotor.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/kit/rs_hfiq.c b/rigs/kit/rs_hfiq.c index 5b7510ee9..ed75b8166 100644 --- a/rigs/kit/rs_hfiq.c +++ b/rigs/kit/rs_hfiq.c @@ -24,9 +24,7 @@ * https://sites.google.com/site/rshfiqtransceiver/home/technical-data/interface-commands * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/kit/si570avrusb.c b/rigs/kit/si570avrusb.c index 41cabc64b..82e918b09 100644 --- a/rigs/kit/si570avrusb.c +++ b/rigs/kit/si570avrusb.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #define BACKEND_VER "20200112" diff --git a/rigs/kit/usrp.c b/rigs/kit/usrp.c index f487289b9..4961cc7a3 100644 --- a/rigs/kit/usrp.c +++ b/rigs/kit/usrp.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include /* * Compile only this model if usrp is available diff --git a/rigs/kit/usrp_impl.cc b/rigs/kit/usrp_impl.cc index 5661c9595..d256743ba 100644 --- a/rigs/kit/usrp_impl.cc +++ b/rigs/kit/usrp_impl.cc @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include /* * Compile only this model if usrp is available diff --git a/rigs/lowe/Android.mk b/rigs/lowe/Android.mk index 871a0aa08..ff895d739 100644 --- a/rigs/lowe/Android.mk +++ b/rigs/lowe/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := hf235.c lowe.c LOCAL_MODULE := lowe -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/lowe/hf235.c b/rigs/lowe/hf235.c index f05077a24..71b8ecfbc 100644 --- a/rigs/lowe/hf235.c +++ b/rigs/lowe/hf235.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/lowe/lowe.c b/rigs/lowe/lowe.c index 559199f13..24e7bbb3d 100644 --- a/rigs/lowe/lowe.c +++ b/rigs/lowe/lowe.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/pcr/Android.mk b/rigs/pcr/Android.mk index 8b4202e01..fbaf44ba7 100644 --- a/rigs/pcr/Android.mk +++ b/rigs/pcr/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := pcr1000.c pcr100.c pcr1500.c pcr2500.c pcr.c LOCAL_MODULE := pcr -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/pcr/pcr.c b/rigs/pcr/pcr.c index c64ac18c8..83ee60598 100644 --- a/rigs/pcr/pcr.c +++ b/rigs/pcr/pcr.c @@ -28,9 +28,7 @@ * (403) PCR1500 fw 2.0, proto 2.0 (usb) by KM3T * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/pcr/pcr100.c b/rigs/pcr/pcr100.c index ab5a7fafb..865e8ce48 100644 --- a/rigs/pcr/pcr100.c +++ b/rigs/pcr/pcr100.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/pcr/pcr1000.c b/rigs/pcr/pcr1000.c index 1b7d7559c..bee94db9d 100644 --- a/rigs/pcr/pcr1000.c +++ b/rigs/pcr/pcr1000.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/pcr/pcr1500.c b/rigs/pcr/pcr1500.c index f15c26172..35f936c4c 100644 --- a/rigs/pcr/pcr1500.c +++ b/rigs/pcr/pcr1500.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/pcr/pcr2500.c b/rigs/pcr/pcr2500.c index 00b199649..9814ac0cb 100644 --- a/rigs/pcr/pcr2500.c +++ b/rigs/pcr/pcr2500.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/prm80/Android.mk b/rigs/prm80/Android.mk index 3438b302b..7eb34866f 100644 --- a/rigs/prm80/Android.mk +++ b/rigs/prm80/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := prm8060.c prm80.c LOCAL_MODULE := prm80 -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/prm80/prm80.c b/rigs/prm80/prm80.c index 45bd517f2..5a81c5cd3 100644 --- a/rigs/prm80/prm80.c +++ b/rigs/prm80/prm80.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/prm80/prm8060.c b/rigs/prm80/prm8060.c index 93812960d..768442b97 100644 --- a/rigs/prm80/prm8060.c +++ b/rigs/prm80/prm8060.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/racal/Android.mk b/rigs/racal/Android.mk index adeec4e6e..4e275eb09 100644 --- a/rigs/racal/Android.mk +++ b/rigs/racal/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := ra6790.c ra3702.c racal.c ra37xx.c LOCAL_MODULE := racal -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/racal/ra3702.c b/rigs/racal/ra3702.c index 587e2b662..f2ff8868e 100644 --- a/rigs/racal/ra3702.c +++ b/rigs/racal/ra3702.c @@ -18,9 +18,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/racal/ra37xx.c b/rigs/racal/ra37xx.c index 5defa64b3..9ddc5b151 100644 --- a/rigs/racal/ra37xx.c +++ b/rigs/racal/ra37xx.c @@ -18,9 +18,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/racal/ra6790.c b/rigs/racal/ra6790.c index 9de166df2..c2c20ff4a 100644 --- a/rigs/racal/ra6790.c +++ b/rigs/racal/ra6790.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/racal/racal.c b/rigs/racal/racal.c index 6c4888cb4..1983a4201 100644 --- a/rigs/racal/racal.c +++ b/rigs/racal/racal.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/rft/Android.mk b/rigs/rft/Android.mk index 724e10b44..fdab89bad 100644 --- a/rigs/rft/Android.mk +++ b/rigs/rft/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := ekd500.c rft.c LOCAL_MODULE := rft -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/rft/ekd500.c b/rigs/rft/ekd500.c index 743f44748..2988ed90f 100644 --- a/rigs/rft/ekd500.c +++ b/rigs/rft/ekd500.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/rft/rft.c b/rigs/rft/rft.c index 8711cea13..54804e1e5 100644 --- a/rigs/rft/rft.c +++ b/rigs/rft/rft.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/rs/Android.mk b/rigs/rs/Android.mk index 74e9fa257..81cf0fbeb 100644 --- a/rigs/rs/Android.mk +++ b/rigs/rs/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := esmc.c eb200.c rs.c xk2100.c gp2000.c LOCAL_MODULE := rs -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/rs/eb200.c b/rigs/rs/eb200.c index b3e7b957e..f00646206 100644 --- a/rigs/rs/eb200.c +++ b/rigs/rs/eb200.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/rs/esmc.c b/rigs/rs/esmc.c index e15b54d09..c3f43e969 100644 --- a/rigs/rs/esmc.c +++ b/rigs/rs/esmc.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/rs/gp2000.c b/rigs/rs/gp2000.c index 6fa5a957e..a29f51289 100644 --- a/rigs/rs/gp2000.c +++ b/rigs/rs/gp2000.c @@ -25,9 +25,7 @@ * Looks like the GP2000 could be reused in other rigs so * we implement that and then the XK2100 uses this interface */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/rs/rs.c b/rigs/rs/rs.c index f1e98cc25..b19f97424 100644 --- a/rigs/rs/rs.c +++ b/rigs/rs/rs.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/rs/xk2100.c b/rigs/rs/xk2100.c index 6d384d9c3..744ea0191 100644 --- a/rigs/rs/xk2100.c +++ b/rigs/rs/xk2100.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/skanti/Android.mk b/rigs/skanti/Android.mk index d62a0b1aa..4e3867af3 100644 --- a/rigs/skanti/Android.mk +++ b/rigs/skanti/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := trp8000.c trp8255.c skanti.c LOCAL_MODULE := skanti -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/skanti/skanti.c b/rigs/skanti/skanti.c index 0a6f1f54f..90d8bf901 100644 --- a/rigs/skanti/skanti.c +++ b/rigs/skanti/skanti.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/skanti/trp8000.c b/rigs/skanti/trp8000.c index 1c1f9064f..c86057ba3 100644 --- a/rigs/skanti/trp8000.c +++ b/rigs/skanti/trp8000.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/skanti/trp8255.c b/rigs/skanti/trp8255.c index d20fde61c..45e733aa3 100644 --- a/rigs/skanti/trp8255.c +++ b/rigs/skanti/trp8255.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tapr/Android.mk b/rigs/tapr/Android.mk index 4e1d5166a..3ec7c2bb5 100644 --- a/rigs/tapr/Android.mk +++ b/rigs/tapr/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := dsp10.c tapr.c LOCAL_MODULE := tapr -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/tapr/dsp10.c b/rigs/tapr/dsp10.c index d18fc0807..2638812f1 100644 --- a/rigs/tapr/dsp10.c +++ b/rigs/tapr/dsp10.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include "hamlib/rig.h" diff --git a/rigs/tapr/tapr.c b/rigs/tapr/tapr.c index 2ba72c202..da40be5ff 100644 --- a/rigs/tapr/tapr.c +++ b/rigs/tapr/tapr.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/tentec/Android.mk b/rigs/tentec/Android.mk index 40aa9cc11..f5274c022 100644 --- a/rigs/tentec/Android.mk +++ b/rigs/tentec/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := rx320.c rx340.c rx350.c rx331.c \ tentec.c tentec2.c tt550.c LOCAL_MODULE := tentec -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/tentec/argonaut.c b/rigs/tentec/argonaut.c index 2b735493f..40697b8d0 100644 --- a/rigs/tentec/argonaut.c +++ b/rigs/tentec/argonaut.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/tentec/jupiter.c b/rigs/tentec/jupiter.c index e72372d5a..7ebad2179 100644 --- a/rigs/tentec/jupiter.c +++ b/rigs/tentec/jupiter.c @@ -32,9 +32,7 @@ * implement dual VFO & split capability */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tentec/omnivii.c b/rigs/tentec/omnivii.c index fa5993e15..fddae5fec 100644 --- a/rigs/tentec/omnivii.c +++ b/rigs/tentec/omnivii.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tentec/orion.c b/rigs/tentec/orion.c index c53adcdb9..81f64ba38 100644 --- a/rigs/tentec/orion.c +++ b/rigs/tentec/orion.c @@ -65,9 +65,7 @@ * This backend supports the Ten-Tec Orion (565) and Orion II (566) transceivers. * \n This backend tested mostly with firmware versions 1.372 and 2.062a */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tentec/paragon.c b/rigs/tentec/paragon.c index 80d011757..3630fd59b 100644 --- a/rigs/tentec/paragon.c +++ b/rigs/tentec/paragon.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tentec/pegasus.c b/rigs/tentec/pegasus.c index 6a98a2cb8..516fc9995 100644 --- a/rigs/tentec/pegasus.c +++ b/rigs/tentec/pegasus.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/tentec/rx320.c b/rigs/tentec/rx320.c index f5ea64c38..eaa8fc4c9 100644 --- a/rigs/tentec/rx320.c +++ b/rigs/tentec/rx320.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/tentec/rx331.c b/rigs/tentec/rx331.c index d417fa5aa..f192ce04f 100644 --- a/rigs/tentec/rx331.c +++ b/rigs/tentec/rx331.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tentec/rx340.c b/rigs/tentec/rx340.c index 4817f3d27..54dcdfd69 100644 --- a/rigs/tentec/rx340.c +++ b/rigs/tentec/rx340.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tentec/rx350.c b/rigs/tentec/rx350.c index 8d187f678..aa57dfb93 100644 --- a/rigs/tentec/rx350.c +++ b/rigs/tentec/rx350.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/tentec/tentec.c b/rigs/tentec/tentec.c index 2cf7d00df..66f7b1a18 100644 --- a/rigs/tentec/tentec.c +++ b/rigs/tentec/tentec.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tentec/tentec2.c b/rigs/tentec/tentec2.c index 884179814..b1d6132ec 100644 --- a/rigs/tentec/tentec2.c +++ b/rigs/tentec/tentec2.c @@ -51,9 +51,7 @@ * For the above command, rcv_len should be 6. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/tentec/tt550.c b/rigs/tentec/tt550.c index b16e03659..60c22def8 100644 --- a/rigs/tentec/tt550.c +++ b/rigs/tentec/tt550.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/rigs/tuner/Android.mk b/rigs/tuner/Android.mk index d05f290f2..6b9aeed21 100644 --- a/rigs/tuner/Android.mk +++ b/rigs/tuner/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := tuner.c v4l.c v4l2.c LOCAL_MODULE := tuner -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/uniden/Android.mk b/rigs/uniden/Android.mk index 1a621d54a..113518482 100644 --- a/rigs/uniden/Android.mk +++ b/rigs/uniden/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := bc895.c bc898.c bc245.c pro2052.c bc780.c bc250.c \ uniden.c uniden_digital.c LOCAL_MODULE := uniden -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/uniden/bc245.c b/rigs/uniden/bc245.c index 3e1895357..96e5f32a4 100644 --- a/rigs/uniden/bc245.c +++ b/rigs/uniden/bc245.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/uniden/bc250.c b/rigs/uniden/bc250.c index fa0cb77d0..7b0ddd1bb 100644 --- a/rigs/uniden/bc250.c +++ b/rigs/uniden/bc250.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/uniden/bc780.c b/rigs/uniden/bc780.c index 45ee2259c..93823a1d9 100644 --- a/rigs/uniden/bc780.c +++ b/rigs/uniden/bc780.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/uniden/bc895.c b/rigs/uniden/bc895.c index a772c6525..725982a6c 100644 --- a/rigs/uniden/bc895.c +++ b/rigs/uniden/bc895.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/uniden/bc898.c b/rigs/uniden/bc898.c index dd55beacb..629ddacde 100644 --- a/rigs/uniden/bc898.c +++ b/rigs/uniden/bc898.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/uniden/bcd396t.c b/rigs/uniden/bcd396t.c index ccd2985d7..9c8929b53 100644 --- a/rigs/uniden/bcd396t.c +++ b/rigs/uniden/bcd396t.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/uniden/bcd996t.c b/rigs/uniden/bcd996t.c index 4c0b12a01..d19a4b540 100644 --- a/rigs/uniden/bcd996t.c +++ b/rigs/uniden/bcd996t.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/uniden/pro2052.c b/rigs/uniden/pro2052.c index 564dc8dfe..18ab78c50 100644 --- a/rigs/uniden/pro2052.c +++ b/rigs/uniden/pro2052.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/uniden/uniden.c b/rigs/uniden/uniden.c index b9cdc7ef8..36e68b3fe 100644 --- a/rigs/uniden/uniden.c +++ b/rigs/uniden/uniden.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/uniden/uniden_digital.c b/rigs/uniden/uniden_digital.c index 502eb02b5..ab1d7c9a1 100644 --- a/rigs/uniden/uniden_digital.c +++ b/rigs/uniden/uniden_digital.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/winradio/Android.mk b/rigs/winradio/Android.mk index a4f19496d..6a05852c9 100644 --- a/rigs/winradio/Android.mk +++ b/rigs/winradio/Android.mk @@ -6,7 +6,7 @@ LOCAL_SRC_FILES := wr1000.c wr1500.c wr1550.c wr3100.c wr3150.c wr3500.c wr3700. g303.c g313.c g305.c winradio.c linradio/wrg313api.c LOCAL_MODULE := winradio -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/wj/Android.mk b/rigs/wj/Android.mk index a3e6b9f11..c68872f79 100644 --- a/rigs/wj/Android.mk +++ b/rigs/wj/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := wj8888.c wj.c LOCAL_MODULE := wj -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/wj/wj.c b/rigs/wj/wj.c index 5fab16397..93691b8ce 100644 --- a/rigs/wj/wj.c +++ b/rigs/wj/wj.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/wj/wj8888.c b/rigs/wj/wj8888.c index ea1ce7b10..35034330a 100644 --- a/rigs/wj/wj8888.c +++ b/rigs/wj/wj8888.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/rigs/yaesu/Android.mk b/rigs/yaesu/Android.mk index a277423f2..08c51c795 100644 --- a/rigs/yaesu/Android.mk +++ b/rigs/yaesu/Android.mk @@ -13,7 +13,7 @@ LOCAL_SRC_FILES := ft100.c ft747.c ft817.c ft847.c ft890.c ft900.c ft920.c \ LOCAL_MODULE := yaesu -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rigs/yaesu/frg100.c b/rigs/yaesu/frg100.c index 4795eef61..ff024357c 100644 --- a/rigs/yaesu/frg100.c +++ b/rigs/yaesu/frg100.c @@ -22,9 +22,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/frg8800.c b/rigs/yaesu/frg8800.c index b2fbb402f..e7978d6a3 100644 --- a/rigs/yaesu/frg8800.c +++ b/rigs/yaesu/frg8800.c @@ -22,9 +22,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/frg9600.c b/rigs/yaesu/frg9600.c index 2311969bf..7c17e7f41 100644 --- a/rigs/yaesu/frg9600.c +++ b/rigs/yaesu/frg9600.c @@ -22,9 +22,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft100.c b/rigs/yaesu/ft100.c index c97828548..2856528de 100644 --- a/rigs/yaesu/ft100.c +++ b/rigs/yaesu/ft100.c @@ -24,9 +24,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c index 49777dbff..176e999ba 100644 --- a/rigs/yaesu/ft1000d.c +++ b/rigs/yaesu/ft1000d.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c index 25ffe3066..a1abeba9f 100644 --- a/rigs/yaesu/ft1000mp.c +++ b/rigs/yaesu/ft1000mp.c @@ -31,9 +31,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft1200.c b/rigs/yaesu/ft1200.c index 38377fc9a..d61f2e9b9 100644 --- a/rigs/yaesu/ft1200.c +++ b/rigs/yaesu/ft1200.c @@ -27,9 +27,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/ft2000.c b/rigs/yaesu/ft2000.c index 52e57867b..62ef5f413 100644 --- a/rigs/yaesu/ft2000.c +++ b/rigs/yaesu/ft2000.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/ft3000.c b/rigs/yaesu/ft3000.c index 2a2e9da45..c3c00424c 100644 --- a/rigs/yaesu/ft3000.c +++ b/rigs/yaesu/ft3000.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "misc.h" diff --git a/rigs/yaesu/ft450.c b/rigs/yaesu/ft450.c index 542ee470d..a4f5bf96c 100644 --- a/rigs/yaesu/ft450.c +++ b/rigs/yaesu/ft450.c @@ -26,9 +26,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c index 81e255ea6..5ca7197f5 100644 --- a/rigs/yaesu/ft5000.c +++ b/rigs/yaesu/ft5000.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/ft600.c b/rigs/yaesu/ft600.c index 5c74effd5..9f5096a85 100644 --- a/rigs/yaesu/ft600.c +++ b/rigs/yaesu/ft600.c @@ -24,9 +24,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/yaesu/ft736.c b/rigs/yaesu/ft736.c index 40fda7b25..0e6116bb5 100644 --- a/rigs/yaesu/ft736.c +++ b/rigs/yaesu/ft736.c @@ -22,9 +22,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c index efa5adfd5..b49a7ad77 100644 --- a/rigs/yaesu/ft747.c +++ b/rigs/yaesu/ft747.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft757gx.c b/rigs/yaesu/ft757gx.c index 25c100834..d7d415c33 100644 --- a/rigs/yaesu/ft757gx.c +++ b/rigs/yaesu/ft757gx.c @@ -35,9 +35,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft767gx.c b/rigs/yaesu/ft767gx.c index 37b28b95b..5dc3ef4f1 100644 --- a/rigs/yaesu/ft767gx.c +++ b/rigs/yaesu/ft767gx.c @@ -34,9 +34,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c index 6485fdbcd..acc510dd2 100644 --- a/rigs/yaesu/ft817.c +++ b/rigs/yaesu/ft817.c @@ -47,9 +47,7 @@ * - the many "fixme" stuff around */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft840.c b/rigs/yaesu/ft840.c index 9fe7bfe8b..01c5efeba 100644 --- a/rigs/yaesu/ft840.c +++ b/rigs/yaesu/ft840.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c index b03732bc5..f072e1e92 100644 --- a/rigs/yaesu/ft847.c +++ b/rigs/yaesu/ft847.c @@ -44,9 +44,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index e64b6a64a..9c4040005 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -53,9 +53,7 @@ * doesn't work from front panel either. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/yaesu/ft890.c b/rigs/yaesu/ft890.c index 595a5cb9d..d3508ca5b 100644 --- a/rigs/yaesu/ft890.c +++ b/rigs/yaesu/ft890.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c index ef94ae335..818b90757 100644 --- a/rigs/yaesu/ft891.c +++ b/rigs/yaesu/ft891.c @@ -30,9 +30,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include "hamlib/rig.h" diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c index 36a232865..10bf76c55 100644 --- a/rigs/yaesu/ft897.c +++ b/rigs/yaesu/ft897.c @@ -59,9 +59,7 @@ * - high swr flag */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft900.c b/rigs/yaesu/ft900.c index 1c0bceaa0..3f59fa105 100644 --- a/rigs/yaesu/ft900.c +++ b/rigs/yaesu/ft900.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft9000.c b/rigs/yaesu/ft9000.c index 0e9f05f52..63997fb4e 100644 --- a/rigs/yaesu/ft9000.c +++ b/rigs/yaesu/ft9000.c @@ -26,9 +26,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/ft920.c b/rigs/yaesu/ft920.c index 2318d7aed..bc2f05068 100644 --- a/rigs/yaesu/ft920.c +++ b/rigs/yaesu/ft920.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c index a88ed4698..a21e3b83c 100644 --- a/rigs/yaesu/ft950.c +++ b/rigs/yaesu/ft950.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/ft980.c b/rigs/yaesu/ft980.c index 6a0e80ee2..d3edd3cf5 100644 --- a/rigs/yaesu/ft980.c +++ b/rigs/yaesu/ft980.c @@ -84,9 +84,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft990.c b/rigs/yaesu/ft990.c index 7da4f9264..526f51929 100644 --- a/rigs/yaesu/ft990.c +++ b/rigs/yaesu/ft990.c @@ -32,9 +32,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index f6ff13efb..ff4d06f3d 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -30,9 +30,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/yaesu/ftdx10.c b/rigs/yaesu/ftdx10.c index a3c7bf245..ef792534a 100644 --- a/rigs/yaesu/ftdx10.c +++ b/rigs/yaesu/ftdx10.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c index 419aff591..986823f8e 100644 --- a/rigs/yaesu/ftdx101.c +++ b/rigs/yaesu/ftdx101.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/ftdx101mp.c b/rigs/yaesu/ftdx101mp.c index 46ecd40d6..d0b05ace7 100644 --- a/rigs/yaesu/ftdx101mp.c +++ b/rigs/yaesu/ftdx101mp.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "hamlib/rig.h" #include "bandplan.h" diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index c3149ca2e..27ec410d9 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -28,9 +28,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rigs/yaesu/vr5000.c b/rigs/yaesu/vr5000.c index 7b3c051f1..4ad7e1687 100644 --- a/rigs/yaesu/vr5000.c +++ b/rigs/yaesu/vr5000.c @@ -54,9 +54,7 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include // cppcheck-suppress * #include diff --git a/rigs/yaesu/vx1700.c b/rigs/yaesu/vx1700.c index 7b370cff0..33aa597e8 100644 --- a/rigs/yaesu/vx1700.c +++ b/rigs/yaesu/vx1700.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rigs/yaesu/yaesu.c b/rigs/yaesu/yaesu.c index 594505cc6..81e783cae 100644 --- a/rigs/yaesu/yaesu.c +++ b/rigs/yaesu/yaesu.c @@ -23,9 +23,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rotators/amsat/Android.mk b/rotators/amsat/Android.mk index 7c1dd6932..7277a1343 100644 --- a/rotators/amsat/Android.mk +++ b/rotators/amsat/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := if100.c LOCAL_MODULE := amsat -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/amsat/if100.c b/rotators/amsat/if100.c index 6d18abde1..440b99a3c 100644 --- a/rotators/amsat/if100.c +++ b/rotators/amsat/if100.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rotators/androidsensor/Android.mk b/rotators/androidsensor/Android.mk index 8c0ab8151..15986e336 100644 --- a/rotators/androidsensor/Android.mk +++ b/rotators/androidsensor/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := androidsensor.cpp ndkimu.cpp LOCAL_MODULE := androidsensor -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/androidsensor/androidsensor.cpp b/rotators/androidsensor/androidsensor.cpp index 35049505f..c625cbfa6 100644 --- a/rotators/androidsensor/androidsensor.cpp +++ b/rotators/androidsensor/androidsensor.cpp @@ -21,9 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/ars/Android.mk b/rotators/ars/Android.mk index e9dfa024a..544c8734a 100644 --- a/rotators/ars/Android.mk +++ b/rotators/ars/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := ars.c LOCAL_MODULE := ars -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/ars/ars.c b/rotators/ars/ars.c index 14b78dcff..5c6e12eb3 100644 --- a/rotators/ars/ars.c +++ b/rotators/ars/ars.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rotators/celestron/Android.mk b/rotators/celestron/Android.mk index 8429df139..0433ccd1d 100644 --- a/rotators/celestron/Android.mk +++ b/rotators/celestron/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := celestron.c LOCAL_MODULE := celestron -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/celestron/celestron.c b/rotators/celestron/celestron.c index 17418ac25..03c068c8b 100644 --- a/rotators/celestron/celestron.c +++ b/rotators/celestron/celestron.c @@ -18,9 +18,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/cnctrk/Android.mk b/rotators/cnctrk/Android.mk index 3c6fb4e34..5c4e8447f 100644 --- a/rotators/cnctrk/Android.mk +++ b/rotators/cnctrk/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := cnctrk.c LOCAL_MODULE := cnctrk -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/cnctrk/cnctrk.c b/rotators/cnctrk/cnctrk.c index 6f98ce43b..49920f873 100644 --- a/rotators/cnctrk/cnctrk.c +++ b/rotators/cnctrk/cnctrk.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/easycomm/Android.mk b/rotators/easycomm/Android.mk index 808a2ecf3..1f951ae9b 100644 --- a/rotators/easycomm/Android.mk +++ b/rotators/easycomm/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := easycomm.c LOCAL_MODULE := easycomm -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/easycomm/easycomm.c b/rotators/easycomm/easycomm.c index ac05e93b8..c3e6bd421 100644 --- a/rotators/easycomm/easycomm.c +++ b/rotators/easycomm/easycomm.c @@ -21,9 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/ether6/Android.mk b/rotators/ether6/Android.mk index cea491be1..136e4a757 100644 --- a/rotators/ether6/Android.mk +++ b/rotators/ether6/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := ether6.c LOCAL_MODULE := ether6 -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/ether6/ether6.c b/rotators/ether6/ether6.c index 105477f29..70dfd3d01 100644 --- a/rotators/ether6/ether6.c +++ b/rotators/ether6/ether6.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rotators/fodtrack/Android.mk b/rotators/fodtrack/Android.mk index bbac6b360..a84f8aa50 100644 --- a/rotators/fodtrack/Android.mk +++ b/rotators/fodtrack/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := fodtrack.c LOCAL_MODULE := fodtrack -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/fodtrack/fodtrack.c b/rotators/fodtrack/fodtrack.c index 57c17537b..15ac37c9c 100644 --- a/rotators/fodtrack/fodtrack.c +++ b/rotators/fodtrack/fodtrack.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rotators/gs232a/Android.mk b/rotators/gs232a/Android.mk index 1430b1f71..2407b7ba0 100644 --- a/rotators/gs232a/Android.mk +++ b/rotators/gs232a/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := gs232a.c gs232b.c gs232.c LOCAL_MODULE := gs232a -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/gs232a/gs232.c b/rotators/gs232a/gs232.c index 56805e2b2..9198240ef 100644 --- a/rotators/gs232a/gs232.c +++ b/rotators/gs232a/gs232.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/gs232a/gs232a.c b/rotators/gs232a/gs232a.c index 589b38920..67fa1e8a4 100644 --- a/rotators/gs232a/gs232a.c +++ b/rotators/gs232a/gs232a.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include // cppcheck-suppress * #include diff --git a/rotators/gs232a/gs232b.c b/rotators/gs232a/gs232b.c index 40e4c56de..682ffb04d 100644 --- a/rotators/gs232a/gs232b.c +++ b/rotators/gs232a/gs232b.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include // cppcheck-suppress * #include diff --git a/rotators/heathkit/Android.mk b/rotators/heathkit/Android.mk index c368c1fee..3bc28af02 100644 --- a/rotators/heathkit/Android.mk +++ b/rotators/heathkit/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := hd1780.c LOCAL_MODULE := heathkit -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/heathkit/hd1780.c b/rotators/heathkit/hd1780.c index 4cfaf9bf8..72dd5d040 100644 --- a/rotators/heathkit/hd1780.c +++ b/rotators/heathkit/hd1780.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* Standard library definitions */ diff --git a/rotators/indi/Android.mk b/rotators/indi/Android.mk index 650fa1007..b72cade29 100644 --- a/rotators/indi/Android.mk +++ b/rotators/indi/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := indi.c indi_wrapper.cpp LOCAL_MODULE := indi -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/indi/indi.c b/rotators/indi/indi.c index 07996fbb8..87f6a2fcf 100644 --- a/rotators/indi/indi.c +++ b/rotators/indi/indi.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "indi_wrapper.h" diff --git a/rotators/ioptron/Android.mk b/rotators/ioptron/Android.mk index 2af395ed4..cfcab0231 100644 --- a/rotators/ioptron/Android.mk +++ b/rotators/ioptron/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := rot_ioptron.c LOCAL_MODULE := ioptron -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/ioptron/rot_ioptron.c b/rotators/ioptron/rot_ioptron.c index e97d3965a..cde53ebab 100644 --- a/rotators/ioptron/rot_ioptron.c +++ b/rotators/ioptron/rot_ioptron.c @@ -18,9 +18,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/m2/Android.mk b/rotators/m2/Android.mk index 4c0b1b436..faffd6058 100644 --- a/rotators/m2/Android.mk +++ b/rotators/m2/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := rc2800.c LOCAL_MODULE := m2 -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/m2/rc2800.c b/rotators/m2/rc2800.c index df535d8b8..968e76344 100644 --- a/rotators/m2/rc2800.c +++ b/rotators/m2/rc2800.c @@ -18,9 +18,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/meade/Android.mk b/rotators/meade/Android.mk index aee5a231f..caf568242 100644 --- a/rotators/meade/Android.mk +++ b/rotators/meade/Android.mk @@ -5,8 +5,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := meade.c LOCAL_MODULE := meade -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY) diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c index 15c3b2b90..704d60e65 100644 --- a/rotators/meade/meade.c +++ b/rotators/meade/meade.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/rotators/prosistel/Android.mk b/rotators/prosistel/Android.mk index 9734efa77..fe17361a3 100644 --- a/rotators/prosistel/Android.mk +++ b/rotators/prosistel/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := prosistel.c LOCAL_MODULE := prosistel -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/prosistel/prosistel.c b/rotators/prosistel/prosistel.c index 2f2948297..3955d49d3 100644 --- a/rotators/prosistel/prosistel.c +++ b/rotators/prosistel/prosistel.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/radant/Android.mk b/rotators/radant/Android.mk index be6ae0979..3f7d6e9f2 100644 --- a/rotators/radant/Android.mk +++ b/rotators/radant/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := radant.c LOCAL_MODULE := radant -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/radant/radant.c b/rotators/radant/radant.c index 3e4230742..ba3ae53d6 100644 --- a/rotators/radant/radant.c +++ b/rotators/radant/radant.c @@ -21,9 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/rotorez/Android.mk b/rotators/rotorez/Android.mk index ca583b21e..20db99f0d 100644 --- a/rotators/rotorez/Android.mk +++ b/rotators/rotorez/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := rotorez.c LOCAL_MODULE := rotorez -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/rotorez/rotorez.c b/rotators/rotorez/rotorez.c index b0ab65ac0..efade0edb 100644 --- a/rotators/rotorez/rotorez.c +++ b/rotators/rotorez/rotorez.c @@ -30,9 +30,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* Standard library definitions */ diff --git a/rotators/sartek/Android.mk b/rotators/sartek/Android.mk index 6bf426d2f..080601400 100644 --- a/rotators/sartek/Android.mk +++ b/rotators/sartek/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := sartek.c LOCAL_MODULE := sartek -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/sartek/sartek.c b/rotators/sartek/sartek.c index 255270dd6..e89f450b3 100644 --- a/rotators/sartek/sartek.c +++ b/rotators/sartek/sartek.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* Standard library definitions */ diff --git a/rotators/satel/Android.mk b/rotators/satel/Android.mk index 450412f30..4a88474c2 100644 --- a/rotators/satel/Android.mk +++ b/rotators/satel/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := satel.c LOCAL_MODULE := satel -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/satel/satel.c b/rotators/satel/satel.c index 9434798d7..3336c89a9 100644 --- a/rotators/satel/satel.c +++ b/rotators/satel/satel.c @@ -21,9 +21,7 @@ #include "hamlib/rig.h" #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/spid/Android.mk b/rotators/spid/Android.mk index 172254f41..38ae4392f 100644 --- a/rotators/spid/Android.mk +++ b/rotators/spid/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := spid.c LOCAL_MODULE := spid -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/spid/spid.c b/rotators/spid/spid.c index 54dbf6b7c..8a80faad0 100644 --- a/rotators/spid/spid.c +++ b/rotators/spid/spid.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/rotators/ts7400/Android.mk b/rotators/ts7400/Android.mk index 3543d5a9b..e8fd1908a 100644 --- a/rotators/ts7400/Android.mk +++ b/rotators/ts7400/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := ts7400.c LOCAL_MODULE := ts7400 -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/rotators/ts7400/ts7400.c b/rotators/ts7400/ts7400.c index 744cd1782..9ef1bb686 100644 --- a/rotators/ts7400/ts7400.c +++ b/rotators/ts7400/ts7400.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include /* String function definitions */ diff --git a/src/Android.mk b/src/Android.mk index 24090e7c3..02e5bf86e 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -32,7 +32,7 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libhamlib -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include LOCAL_STATIC_LIBRARIES := adat alinco amsat aor ars barrett celestron cnctrk \ dorji drake dummy easycomm elad ether6 flexradio fodtrack \ diff --git a/src/amp_conf.c b/src/amp_conf.c index 19588acb2..738f3089a 100644 --- a/src/amp_conf.c +++ b/src/amp_conf.c @@ -29,9 +29,7 @@ * \file amp_conf.c */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/amp_reg.c b/src/amp_reg.c index d69004532..d9c272f6c 100644 --- a/src/amp_reg.c +++ b/src/amp_reg.c @@ -27,9 +27,7 @@ * doc todo: Let's explain what's going on here! */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/amp_settings.c b/src/amp_settings.c index 6493664a6..2310d4a29 100644 --- a/src/amp_settings.c +++ b/src/amp_settings.c @@ -39,9 +39,7 @@ * This Hamlib interface is a frontend implementing wrapper functions. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include diff --git a/src/amplifier.c b/src/amplifier.c index cc623d065..0203c55dd 100644 --- a/src/amplifier.c +++ b/src/amplifier.c @@ -48,9 +48,7 @@ * CAT type control. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/cal.c b/src/cal.c index 8abd75a7a..2083a522e 100644 --- a/src/cal.c +++ b/src/cal.c @@ -30,9 +30,7 @@ * \brief Calibration routines. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include "cal.h" diff --git a/src/cm108.c b/src/cm108.c index 9c942edfd..21b50a7b3 100644 --- a/src/cm108.c +++ b/src/cm108.c @@ -32,9 +32,7 @@ * CM108 Audio chips found on many USB audio interfaces have controllable * General Purpose Input/Output pins. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/src/conf.c b/src/conf.c index 4905b86a6..3c9e19aa1 100644 --- a/src/conf.c +++ b/src/conf.c @@ -30,9 +30,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/debug.c b/src/debug.c index 92a2f76b2..d011e30d7 100644 --- a/src/debug.c +++ b/src/debug.c @@ -30,9 +30,7 @@ * \brief Control Hamlib debugging functions. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/event.c b/src/event.c index f06cba8f3..795027ce3 100644 --- a/src/event.c +++ b/src/event.c @@ -32,9 +32,7 @@ * \brief Event handling */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/ext.c b/src/ext.c index 9895b2b5c..e3b055242 100644 --- a/src/ext.c +++ b/src/ext.c @@ -34,9 +34,7 @@ * basic "virtual rig" of Hamlib. See icom/ic746.c for an example. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/extamp.c b/src/extamp.c index e9289035e..e39fb2777 100644 --- a/src/extamp.c +++ b/src/extamp.c @@ -40,9 +40,7 @@ * `amplifiers/elecraft/kpa.c` for an example. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/iofunc.c b/src/iofunc.c index cad61ecc9..f9c8ef02e 100644 --- a/src/iofunc.c +++ b/src/iofunc.c @@ -31,9 +31,7 @@ * @{ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/src/locator.c b/src/locator.c index 07bd653b7..31b787317 100644 --- a/src/locator.c +++ b/src/locator.c @@ -76,9 +76,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/mem.c b/src/mem.c index 6e6efcd3d..362417f5c 100644 --- a/src/mem.c +++ b/src/mem.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/microham.c b/src/microham.c index e757f6853..83f6bfa19 100644 --- a/src/microham.c +++ b/src/microham.c @@ -27,9 +27,7 @@ // support socketpair(). // -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/misc.c b/src/misc.c index 2aea9acbe..dc3a4842b 100644 --- a/src/misc.c +++ b/src/misc.c @@ -28,9 +28,7 @@ * \brief Miscellaneous utility routines */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/network.c b/src/network.c index 77a9c932c..af62f4bdc 100644 --- a/src/network.c +++ b/src/network.c @@ -32,9 +32,7 @@ /* Forcing WINVER in MinGW yanks in getaddrinfo(), but locks out Win95/Win98 */ /* #define WINVER 0x0501 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/src/parallel.c b/src/parallel.c index f4521e4d0..3710947b6 100644 --- a/src/parallel.c +++ b/src/parallel.c @@ -28,9 +28,7 @@ * \brief Parallel Port IO * \file parallel.c */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/src/register.c b/src/register.c index 18f2bf9e7..b92be9e93 100644 --- a/src/register.c +++ b/src/register.c @@ -26,9 +26,7 @@ * doc todo: Let's explain what's going on here! */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/rot_conf.c b/src/rot_conf.c index 9e2756340..507b8382e 100644 --- a/src/rot_conf.c +++ b/src/rot_conf.c @@ -30,9 +30,7 @@ * \file rot_conf.c */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/rot_ext.c b/src/rot_ext.c index 73aa44688..d9223a496 100644 --- a/src/rot_ext.c +++ b/src/rot_ext.c @@ -38,9 +38,7 @@ * rotator" of Hamlib. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include /* Standard input/output definitions */ #include /* String function definitions */ diff --git a/src/rot_reg.c b/src/rot_reg.c index 05494a9c6..1300b36b7 100644 --- a/src/rot_reg.c +++ b/src/rot_reg.c @@ -27,9 +27,7 @@ * doc todo: Let's explain what's going on here! */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/rot_settings.c b/src/rot_settings.c index 749834bbd..28f1c292a 100644 --- a/src/rot_settings.c +++ b/src/rot_settings.c @@ -35,9 +35,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/rotator.c b/src/rotator.c index b4b5016d6..6e94f3b69 100644 --- a/src/rotator.c +++ b/src/rotator.c @@ -46,9 +46,7 @@ * etc. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/serial.c b/src/serial.c index 3987002ef..aa743153c 100644 --- a/src/serial.c +++ b/src/serial.c @@ -32,9 +32,7 @@ * \file serial.c */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include /* Standard input/output definitions */ diff --git a/src/settings.c b/src/settings.c index 42e72136a..063604cf7 100644 --- a/src/settings.c +++ b/src/settings.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/src/snapshot_data.c b/src/snapshot_data.c index f88137456..7332ded21 100644 --- a/src/snapshot_data.c +++ b/src/snapshot_data.c @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include "misc.h" diff --git a/src/sprintflst.c b/src/sprintflst.c index 739197cd8..1907a1f51 100644 --- a/src/sprintflst.c +++ b/src/sprintflst.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include /* Standard input/output definitions */ #include /* String function definitions */ diff --git a/src/tones.c b/src/tones.c index d5c2ff8b2..c77704b79 100644 --- a/src/tones.c +++ b/src/tones.c @@ -30,9 +30,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include diff --git a/src/usb_port.c b/src/usb_port.c index 53b287f2e..9d91cde68 100644 --- a/src/usb_port.c +++ b/src/usb_port.c @@ -31,9 +31,7 @@ * doc todo: deal with defined(HAVE_LIBUSB)... quashing the doc process. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include diff --git a/tests/Android.mk b/tests/Android.mk index 82208f946..01379a3fe 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := rotctld.c rotctl_parse.c dumpcaps_rot.c ../src/rot_settings.c LOCAL_MODULE := rotctld -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) @@ -16,7 +16,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := rotctl.c rotctl_parse.c dumpcaps_rot.c ../src/rot_settings.c LOCAL_MODULE := rotctl -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := LOCAL_C_INCLUDES := android include src LOCAL_LDLIBS := -lhamlib -Lobj/local/$(TARGET_ARCH_ABI) diff --git a/tests/ampctl.c b/tests/ampctl.c index f1ce8afc9..cbe6f4a13 100644 --- a/tests/ampctl.c +++ b/tests/ampctl.c @@ -26,9 +26,7 @@ */ #include -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/ampctl_parse.c b/tests/ampctl_parse.c index 3f5e3f5c2..40445d773 100644 --- a/tests/ampctl_parse.c +++ b/tests/ampctl_parse.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/ampctld.c b/tests/ampctld.c index 045a3d8a7..bd2b323a7 100644 --- a/tests/ampctld.c +++ b/tests/ampctld.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/dumpcaps.c b/tests/dumpcaps.c index ee73e0b76..10b1eaa06 100644 --- a/tests/dumpcaps.c +++ b/tests/dumpcaps.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/dumpcaps_amp.c b/tests/dumpcaps_amp.c index 477433fbd..cdb0634a0 100644 --- a/tests/dumpcaps_amp.c +++ b/tests/dumpcaps_amp.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/dumpcaps_rot.c b/tests/dumpcaps_rot.c index b75c01e23..5ef176fb7 100644 --- a/tests/dumpcaps_rot.c +++ b/tests/dumpcaps_rot.c @@ -19,9 +19,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/dumpmem.c b/tests/dumpmem.c index 24ffe802f..7765ac518 100644 --- a/tests/dumpmem.c +++ b/tests/dumpmem.c @@ -26,9 +26,7 @@ #include -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "misc.h" diff --git a/tests/memcsv.c b/tests/memcsv.c index ce2e3d461..86d6485f0 100644 --- a/tests/memcsv.c +++ b/tests/memcsv.c @@ -21,9 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/rigctl.c b/tests/rigctl.c index 0b59df200..38006ca07 100644 --- a/tests/rigctl.c +++ b/tests/rigctl.c @@ -25,9 +25,7 @@ */ #include -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index 0ff4cf2f8..7d4d771e7 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/rigctlcom.c b/tests/rigctlcom.c index a9b4f46ac..91bd2a4f2 100644 --- a/tests/rigctlcom.c +++ b/tests/rigctlcom.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #ifdef WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/tests/rigctld.c b/tests/rigctld.c index 64f7e7070..15e337e16 100644 --- a/tests/rigctld.c +++ b/tests/rigctld.c @@ -23,9 +23,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #ifdef WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/tests/rigmem.c b/tests/rigmem.c index 4d422747b..f65b77398 100644 --- a/tests/rigmem.c +++ b/tests/rigmem.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/rigsmtr.c b/tests/rigsmtr.c index b992dd91c..7387644f1 100644 --- a/tests/rigsmtr.c +++ b/tests/rigsmtr.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/rigswr.c b/tests/rigswr.c index 6ceec7053..9dc6ff5f4 100644 --- a/tests/rigswr.c +++ b/tests/rigswr.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/rotctl.c b/tests/rotctl.c index 1e678e412..1f8f6712b 100644 --- a/tests/rotctl.c +++ b/tests/rotctl.c @@ -25,9 +25,7 @@ */ #include -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c index 7155a9dc5..d6510a96e 100644 --- a/tests/rotctl_parse.c +++ b/tests/rotctl_parse.c @@ -26,9 +26,7 @@ // TODO: Add "symmetric" set_conf + get_conf to rigctl+rotctl -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/rotctld.c b/tests/rotctld.c index bd10c976b..a106e14a7 100644 --- a/tests/rotctld.c +++ b/tests/rotctld.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/testbcd.c b/tests/testbcd.c index 86a325dfd..a7a457b73 100644 --- a/tests/testbcd.c +++ b/tests/testbcd.c @@ -4,9 +4,7 @@ * This is mainly to test freq2bcd and bcd2freq functions. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/testfreq.c b/tests/testfreq.c index 90ed5a4ef..410171f30 100644 --- a/tests/testfreq.c +++ b/tests/testfreq.c @@ -4,9 +4,7 @@ * This is mainly to test kHz, MHz, GHz macros and int64_t support. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/tests/testrig.c b/tests/testrig.c index d75f54b82..801f3ed31 100644 --- a/tests/testrig.c +++ b/tests/testrig.c @@ -11,9 +11,7 @@ #include "misc.h" -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #define SERIAL_PORT "/dev/pts/2" diff --git a/tests/testrigopen.c b/tests/testrigopen.c index 966183d10..a8d141b10 100644 --- a/tests/testrigopen.c +++ b/tests/testrigopen.c @@ -12,9 +12,7 @@ #include "misc.h" -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #define SERIAL_PORT "/dev/ttyUSB0" diff --git a/tests/testtrn.c b/tests/testtrn.c index 7b0046e24..7215a8869 100644 --- a/tests/testtrn.c +++ b/tests/testtrn.c @@ -9,9 +9,7 @@ #include -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #define SERIAL_PORT "/dev/ttyS0"