Skip to content
This repository was archived by the owner on Mar 24, 2025. It is now read-only.

Commit 47f3212

Browse files
sjlonglandabtink
sjlongland
authored and
abtink
committed
Do not use glibc-internal header sys/cdefs.h (#362)
The `sys/cdefs.h` is an internal header of `glibc` and is not meant to be used by user code. The macros needed from it can be trivially implemented where required, relying on this header being present excludes `wpantund` from being used on systems where `glibc` is not the used C library (e.g. OpenWRT, where `uclibc` or `musl` is standard). https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I-get-error-messages-about-%3Ccode%3Esys/cdefs.h%3C/code%3E
1 parent 08a4fc4 commit 47f3212

13 files changed

+78
-41
lines changed

‎src/ncp-spinel/spinel-extra.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222

2323
#include "spinel.h"
2424

25-
__BEGIN_DECLS
25+
#if defined(__cplusplus)
26+
extern "C" {
27+
#endif
2628

2729
// ----------------------------------------------------------------------------
2830

@@ -74,6 +76,8 @@ SPINEL_API_EXTERN spinel_ssize_t spinel_cmd_prop_type_get(uint8_t* cmd_data_ptr,
7476

7577
SPINEL_API_EXTERN spinel_ssize_t spinel_cmd_prop_type_get(uint8_t* cmd_data_ptr, spinel_size_t cmd_data_len, spinel_prop_key_t prop_key);
7678

77-
__END_DECLS
79+
#if defined(__cplusplus)
80+
}
81+
#endif
7882

7983
#endif // SPINEL_EXTRA_HEADER_INCLUDED

‎src/util/config-file.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,18 @@
1818
#ifndef __WPAN_CONFIG_FILE_H__
1919
#define __WPAN_CONFIG_FILE_H__ 1
2020

21-
__BEGIN_DECLS
21+
#if defined(__cplusplus)
22+
extern "C" {
23+
#endif
2224
extern char* get_next_arg(char *buf, char **rest);
2325

2426
typedef int (*config_param_set_func)(void* context, const char* key, const char* value);
2527

2628
extern int read_config(const char* filename, config_param_set_func setter, void* context);
2729

2830
extern int fread_config(FILE* file, config_param_set_func setter, void* context);
29-
__END_DECLS
31+
#if defined(__cplusplus)
32+
}
33+
#endif
3034

3135
#endif // __WPAN_CONFIG_FILE_H__

‎src/util/netif-mgmt.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
#include <stdint.h>
2727
#include <stdbool.h>
2828

29-
__BEGIN_DECLS
29+
#if defined(__cplusplus)
30+
extern "C" {
31+
#endif
3032
extern int netif_mgmt_open();
3133
extern void netif_mgmt_close(int fd);
3234

@@ -53,7 +55,9 @@ extern int netif_mgmt_remove_ipv6_route(int fd, const char* if_name, const uint8
5355
extern int netif_mgmt_join_ipv6_multicast_address(int reqfd, const char* if_name, const uint8_t addr[16]);
5456
extern int netif_mgmt_leave_ipv6_multicast_address(int reqfd, const char* if_name, const uint8_t addr[16]);
5557

56-
__END_DECLS
58+
#if defined(__cplusplus)
59+
}
60+
#endif
5761

5862

5963
#endif

‎src/util/nlpt-select.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
#include <stdbool.h>
2727
#include <poll.h>
2828
#include <sys/select.h>
29-
#include <sys/cdefs.h>
3029

31-
__BEGIN_DECLS
30+
#if defined(__cplusplus)
31+
extern "C" {
32+
#endif
3233

3334
struct nlpt {
3435
struct pt pt;
@@ -70,6 +71,8 @@ extern void nlpt_select_update_fd_set(
7071
);
7172
extern bool _nlpt_checkpoll(int fd, short poll_flags);
7273

73-
__END_DECLS
74+
#if defined(__cplusplus)
75+
}
76+
#endif
7477

7578
#endif

‎src/util/sec-random.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@
2020
#ifndef SEC_RANDOM_HEADER_INCLUDED
2121
#define SEC_RANDOM_HEADER_INCLUDED 1
2222

23-
#include <sys/cdefs.h>
2423
#include <stdint.h>
2524

26-
__BEGIN_DECLS
25+
#if defined(__cplusplus)
26+
extern "C" {
27+
#endif
2728

2829
int sec_random_init(void);
2930
int sec_random_fill(uint8_t* buffer, int length);
3031

31-
__END_DECLS
32+
#if defined(__cplusplus)
33+
}
34+
#endif
3235

3336
#endif // SEC_RANDOM_HEADER_INCLUDED

‎src/util/socket-utils.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
#define SOCKET_UTILS_DEFAULT_SHELL "/bin/sh"
3939
#endif
4040

41-
__BEGIN_DECLS
41+
#if defined(__cplusplus)
42+
extern "C" {
43+
#endif
4244
extern int gSocketWrapperBaud;
4345
bool socket_name_is_device(const char* socket_name);
4446
int lookup_sockaddr_from_host_and_port( struct sockaddr_in6* outaddr, const char* host, const char* port);
@@ -61,7 +63,9 @@ int get_super_socket_type_from_path(const char* path);
6163

6264
int fork_unixdomain_socket(int* fd_pointer);
6365

64-
__END_DECLS
66+
#if defined(__cplusplus)
67+
}
68+
#endif
6569

6670

6771
#endif

‎src/util/string-utils.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@
2828
#include <stdint.h>
2929
#include <string.h>
3030
#include <stdbool.h>
31-
#include <sys/cdefs.h>
3231

3332
#define strcaseequal(x, y) (strcasecmp(x, y) == 0)
3433
#define strncaseequal(x, y, n) (strncasecmp(x, y, n) == 0)
3534
#define strequal(x, y) (strcmp(x, y) == 0)
3635
#define strnequal(x, y, n) (strncmp(x, y, n) == 0)
3736

38-
__BEGIN_DECLS
37+
#if defined(__cplusplus)
38+
extern "C" {
39+
#endif
3940
extern void memcpyrev(void* dest, const void *src, size_t len);
4041
extern int memcmprev(const void* dest, const void *src, size_t len);
4142
extern void reverse_bytes(uint8_t *bytes, size_t count);
@@ -66,6 +67,8 @@ uint32_t strtomask_uint32(const char* in_string);
6667

6768
extern bool strtobool(const char* string);
6869

69-
__END_DECLS
70+
#if defined(__cplusplus)
71+
}
72+
#endif
7073

7174
#endif

‎src/util/time-utils.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
#include <stdint.h>
3232
#include <stdbool.h>
33-
#include <sys/cdefs.h>
3433
#include <time.h>
3534

3635
#ifndef MSEC_PER_SEC
@@ -55,7 +54,9 @@
5554

5655
#define CMS_SINCE(x) (time_ms() - (x))
5756

58-
__BEGIN_DECLS
57+
#if defined(__cplusplus)
58+
extern "C" {
59+
#endif
5960
typedef int32_t cms_t;
6061

6162
extern cms_t time_ms(void);
@@ -68,6 +69,8 @@ extern void fuzz_set_cms(cms_t value);
6869
extern void fuzz_ff_cms(cms_t increment);
6970
#endif
7071

71-
__END_DECLS
72+
#if defined(__cplusplus)
73+
}
74+
#endif
7275

7376
#endif

‎src/util/tunnel.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,16 @@
3535

3636
#define TUNNEL_MAX_INTERFACE_NAME_LEN 60
3737

38-
__BEGIN_DECLS
38+
#if defined(__cplusplus)
39+
extern "C" {
40+
#endif
3941
extern int tunnel_open(const char* tun_name);
4042
extern int tunnel_get_name(int fd, char* name, int maxlen);
4143
extern int tunnel_set_hwaddr(int fd, uint8_t *addr, int addr_len);
4244
extern void tunnel_close(int fd);
43-
__END_DECLS
45+
#if defined(__cplusplus)
46+
}
47+
#endif
4448

4549

4650
#endif

‎src/version.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@
1919

2020
#ifndef INTERNAL_VERSION_H__
2121

22-
#include <sys/cdefs.h>
2322

24-
__BEGIN_DECLS
23+
#if defined(__cplusplus)
24+
extern "C" {
25+
#endif
2526
extern const char *internal_build_source_version;
2627
extern const char *internal_build_date;
27-
__END_DECLS
28+
#if defined(__cplusplus)
29+
}
30+
#endif
2831

2932
#endif // INTERNAL_VERSION_H__

‎src/wpantund/wpan-error.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
#define wpantund_wpan_error_h
2121
#include <stddef.h>
2222

23-
__BEGIN_DECLS
23+
#if defined(__cplusplus)
24+
extern "C" {
25+
#endif
2426

2527
typedef enum {
2628
kWPANTUNDStatus_Ok = 0,
@@ -75,6 +77,8 @@ typedef enum {
7577

7678
extern const char* wpantund_status_to_cstr(int status);
7779

78-
__END_DECLS
80+
#if defined(__cplusplus)
81+
}
82+
#endif
7983

8084
#endif

‎src/wpantund/wpantund.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,13 @@ using ::boost::shared_ptr;
129129

130130
#ifndef SOURCE_VERSION
131131
#define SOURCE_VERSION PACKAGE_VERSION
132-
__BEGIN_DECLS
132+
#if defined(__cplusplus)
133+
extern "C" {
134+
#endif
133135
#include "version.c.in"
134-
__END_DECLS
136+
#if defined(__cplusplus)
137+
}
138+
#endif
135139
#endif
136140

137141
using namespace nl;

‎third_party/openthread/src/ncp/spinel.h

+6-12
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,6 @@
5151
#define SPINEL_API_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
5252
#endif // ifdef __GNUC__
5353

54-
#if !defined(__BEGIN_DECLS) || !defined(__END_DECLS)
55-
#if defined(__cplusplus)
56-
#define __BEGIN_DECLS extern "C" {
57-
#define __END_DECLS }
58-
#else // if defined(__cplusplus)
59-
#define __BEGIN_DECLS
60-
#define __END_DECLS
61-
#endif // else defined(__cplusplus)
62-
#endif // if !defined(__BEGIN_DECLS) || !defined(__END_DECLS)
63-
6454
#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS
6555

6656
#ifndef SPINEL_API_EXTERN
@@ -105,7 +95,9 @@
10595

10696
// ----------------------------------------------------------------------------
10797

108-
__BEGIN_DECLS
98+
#if defined(__cplusplus)
99+
extern "C" {
100+
#endif
109101

110102
typedef enum {
111103
SPINEL_STATUS_OK = 0, ///< Operation has completed successfully.
@@ -2587,6 +2579,8 @@ SPINEL_API_EXTERN const char *spinel_capability_to_cstr(unsigned int capability)
25872579

25882580
// ----------------------------------------------------------------------------
25892581

2590-
__END_DECLS
2582+
#if defined(__cplusplus)
2583+
}
2584+
#endif
25912585

25922586
#endif /* defined(SPINEL_HEADER_INCLUDED) */

0 commit comments

Comments
 (0)