Skip to content

Commit 68e121d

Browse files
mdblack98mdblack98
committed
Change all to remove HAVE_CONFIG dependency and include <hamlib/config.h> 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 Hamlib#947
1 parent d6d4469 commit 68e121d

File tree

407 files changed

+408
-1113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

407 files changed

+408
-1113
lines changed

‎amplifiers/elecraft/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
55
LOCAL_SRC_FILES := elecraft.c kpa.c kpa1500.c
66
LOCAL_MODULE := elecraft
77

8-
LOCAL_CFLAGS := -DHAVE_CONFIG_H
8+
LOCAL_CFLAGS :=
99
LOCAL_C_INCLUDES := android include src
1010
LOCAL_LDLIBS := -lhamlib
1111

‎amplifiers/elecraft/kpa1500.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
*
2323
*/
2424

25-
#ifdef HAVE_CONFIG_H
26-
#include "config.h"
27-
#endif
25+
#include <hamlib/config.h>
2826

2927
#include <stdio.h>
3028
#include <stdlib.h> /* Standard library definitions */

‎bindings/hamlib.swg‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
30+
#include <hamlib/config.h>
3331

3432
#include <hamlib/rig.h>
3533
#include <hamlib/rotator.h>

‎c++/ampclass.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
*
3030
*/
3131

32-
#ifdef HAVE_CONFIG_H
33-
#include "config.h"
34-
#endif
32+
#include <hamlib/config.h>
3533

3634
//#include <hamlib/ampator.h>
3735
#include <hamlib/ampclass.h>

‎c++/rigclass.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
*
2929
*/
3030

31-
#ifdef HAVE_CONFIG_H
32-
#include "config.h"
33-
#endif
31+
#include <hamlib/config.h>
3432

3533
#include <hamlib/rig.h>
3634
#include <hamlib/rigclass.h>

‎c++/rotclass.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
*
2929
*/
3030

31-
#ifdef HAVE_CONFIG_H
32-
#include "config.h"
33-
#endif
31+
#include <hamlib/config.h>
3432

3533
#include <hamlib/rotator.h>
3634
#include <hamlib/rotclass.h>

‎cppcheck.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ SUPPRESS="\
4646

4747
CHECK="\
4848
-Duint64_t \
49-
-D HAVE_CONFIG_H \
5049
-D HAMLIB_EXPORT \
5150
-D HAMLIB_EXPORT_VAR \
5251
-D __WORDSIZE \

‎extra/gnuradio/gnuradio.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
*
2121
*/
2222

23-
#ifdef HAVE_CONFIG_H
24-
#include "config.h"
25-
#endif
23+
#include <hamlib/config.h>
2624

2725
/*
2826
* Simple backend of a chirp source.

‎extra/gnuradio/gr.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
*
2020
*/
2121

22-
#ifdef HAVE_CONFIG_H
23-
#include "config.h"
24-
#endif
22+
#include <hamlib/config.h>
2523

2624
#include <stdlib.h>
2725

‎extra/gnuradio/graudio.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
*
2020
*/
2121

22-
#ifdef HAVE_CONFIG_H
23-
#include "config.h"
24-
#endif
22+
#include <hamlib/config.h>
2523

2624
#include <stdlib.h>
2725

0 commit comments

Comments
 (0)