shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-09 01:18:19 +03:00
Code

build-sys: change all HAVE_DECL_ macros to HAVE_

Browse Source 
This is a legacy of autotools, where one detection routine used a different
prefix then the others.

$ git grep -e HAVE_DECL_ -l|xargs sed -i s/HAVE_DECL_/HAVE_/g
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-10-03 10:32:34 +02:00
parent 8bdaf088ca
commit 4b9545f19e
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -419,7 +419,7 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'],
]
prefix = decl.length() > 2 ? decl[2] : ''
have = cc.has_header_symbol(decl[1], decl[0], prefix : prefix)
conf.set10('HAVE_DECL_' + decl[0], have)
conf.set10('HAVE_' + decl[0], have)
endforeach
skip = false
@ -452,15 +452,15 @@ foreach ident : [
]
have = cc.has_function(ident[0], prefix : ident[1])
conf.set10('HAVE_DECL_' + ident[0].to_upper(), have)
conf.set10('HAVE_' + ident[0].to_upper(), have)
endforeach
if cc.has_function('getrandom', prefix : '''#include <sys/random.h>''')
conf.set('USE_SYS_RANDOM_H', true)
conf.set10('HAVE_DECL_GETRANDOM', true)
conf.set10('HAVE_GETRANDOM', true)
else
have = cc.has_function('getrandom', prefix : '''#include <linux/random.h>''')
conf.set10('HAVE_DECL_GETRANDOM', have)
conf.set10('HAVE_GETRANDOM', have)
endif
#####################################################################

42
src/basic/missing.h
View File

@ -613,7 +613,7 @@ struct input_mask {
#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
#endif
#if !HAVE_DECL_LO_FLAGS_PARTSCAN
#if !HAVE_LO_FLAGS_PARTSCAN
#define LO_FLAGS_PARTSCAN 8
#endif
@ -625,7 +625,7 @@ struct input_mask {
#define LOOP_CTL_GET_FREE 0x4C82
#endif
#if !HAVE_DECL_IFLA_INET6_ADDR_GEN_MODE
#if !HAVE_IFLA_INET6_ADDR_GEN_MODE
#define IFLA_INET6_UNSPEC 0
#define IFLA_INET6_FLAGS 1
#define IFLA_INET6_CONF 2
@ -643,11 +643,11 @@ struct input_mask {
#define IN6_ADDR_GEN_MODE_NONE 1
#endif
#if !HAVE_DECL_IN6_ADDR_GEN_MODE_STABLE_PRIVACY
#if !HAVE_IN6_ADDR_GEN_MODE_STABLE_PRIVACY
#define IN6_ADDR_GEN_MODE_STABLE_PRIVACY 2
#endif
#if !HAVE_DECL_IFLA_MACVLAN_FLAGS
#if !HAVE_IFLA_MACVLAN_FLAGS
#define IFLA_MACVLAN_UNSPEC 0
#define IFLA_MACVLAN_MODE 1
#define IFLA_MACVLAN_FLAGS 2
@ -656,7 +656,7 @@ struct input_mask {
#define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_IPVLAN_MODE
#if !HAVE_IFLA_IPVLAN_MODE
#define IFLA_IPVLAN_UNSPEC 0
#define IFLA_IPVLAN_MODE 1
#define __IFLA_IPVLAN_MAX 2
@ -668,7 +668,7 @@ struct input_mask {
#define IPVLAN_MAX 2
#endif
#if !HAVE_DECL_IFLA_VTI_REMOTE
#if !HAVE_IFLA_VTI_REMOTE
#define IFLA_VTI_UNSPEC 0
#define IFLA_VTI_LINK 1
#define IFLA_VTI_IKEY 2
@ -680,7 +680,7 @@ struct input_mask {
#define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_PHYS_PORT_ID
#if !HAVE_IFLA_PHYS_PORT_ID
#define IFLA_EXT_MASK 29
#undef IFLA_PROMISCUITY
#define IFLA_PROMISCUITY 30
@ -693,7 +693,7 @@ struct input_mask {
#define IFLA_MAX (__IFLA_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_BOND_AD_INFO
#if !HAVE_IFLA_BOND_AD_INFO
#define IFLA_BOND_UNSPEC 0
#define IFLA_BOND_MODE 1
#define IFLA_BOND_ACTIVE_SLAVE 2
@ -723,7 +723,7 @@ struct input_mask {
#define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_VLAN_PROTOCOL
#if !HAVE_IFLA_VLAN_PROTOCOL
#define IFLA_VLAN_UNSPEC 0
#define IFLA_VLAN_ID 1
#define IFLA_VLAN_FLAGS 2
@ -735,7 +735,7 @@ struct input_mask {
#define IFLA_VLAN_MAX (__IFLA_VLAN_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_VXLAN_GPE
#if !HAVE_IFLA_VXLAN_GPE
#define IFLA_VXLAN_UNSPEC 0
#define IFLA_VXLAN_ID 1
#define IFLA_VXLAN_GROUP 2
@ -770,7 +770,7 @@ struct input_mask {
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_GENEVE_LABEL
#if !HAVE_IFLA_GENEVE_LABEL
#define IFLA_GENEVE_UNSPEC 0
#define IFLA_GENEVE_ID 1
#define IFLA_GENEVE_REMOTE 2
@ -789,7 +789,7 @@ struct input_mask {
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_IPTUN_ENCAP_DPORT
#if !HAVE_IFLA_IPTUN_ENCAP_DPORT
#define IFLA_IPTUN_UNSPEC 0
#define IFLA_IPTUN_LINK 1
#define IFLA_IPTUN_LOCAL 2
@ -815,7 +815,7 @@ struct input_mask {
#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_GRE_ENCAP_DPORT
#if !HAVE_IFLA_GRE_ENCAP_DPORT
#define IFLA_GRE_UNSPEC 0
#define IFLA_GRE_LINK 1
#define IFLA_GRE_IFLAGS 2
@ -840,7 +840,7 @@ struct input_mask {
#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_BRIDGE_VLAN_INFO
#if !HAVE_IFLA_BRIDGE_VLAN_INFO
#define IFLA_BRIDGE_FLAGS 0
#define IFLA_BRIDGE_MODE 1
#define IFLA_BRIDGE_VLAN_INFO 2
@ -857,7 +857,7 @@ struct input_mask {
#define BRIDGE_VLAN_INFO_RANGE_END (1<<4) /* VLAN is end of vlan range */
#endif
#if !HAVE_DECL_IFLA_BR_VLAN_DEFAULT_PVID
#if !HAVE_IFLA_BR_VLAN_DEFAULT_PVID
#define IFLA_BR_UNSPEC 0
#define IFLA_BR_FORWARD_DELAY 1
#define IFLA_BR_HELLO_TIME 2
@ -903,7 +903,7 @@ struct input_mask {
#define IFLA_BR_MAX (__IFLA_BR_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_BRPORT_LEARNING_SYNC
#if !HAVE_IFLA_BRPORT_LEARNING_SYNC
#define IFLA_BRPORT_UNSPEC 0
#define IFLA_BRPORT_STATE 1
#define IFLA_BRPORT_PRIORITY 2
@ -920,7 +920,7 @@ struct input_mask {
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
#endif
#if !HAVE_DECL_FRA_UID_RANGE
#if !HAVE_FRA_UID_RANGE
#define FRA_UNSPEC 0
#define FRA_DST 1
#define FRA_SRC 2
@ -947,15 +947,15 @@ struct input_mask {
#define FRA_MAX (__FRA_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_BRPORT_PROXYARP
#if !HAVE_IFLA_BRPORT_PROXYARP
#define IFLA_BRPORT_PROXYARP 10
#endif
#if !HAVE_DECL_IFLA_VRF_TABLE
#if !HAVE_IFLA_VRF_TABLE
#define IFLA_VRF_TABLE 1
#endif
#if !HAVE_DECL_NDA_IFINDEX
#if !HAVE_NDA_IFINDEX
#define NDA_UNSPEC 0
#define NDA_DST 1
#define NDA_LLADDR 2
@ -1039,7 +1039,7 @@ struct input_mask {
#define LOOPBACK_IFINDEX 1
#endif
#if !HAVE_DECL_IFA_FLAGS
#if !HAVE_IFA_FLAGS
#define IFA_FLAGS 8
#endif

22
src/basic/missing_syscall.h
View File

@ -24,7 +24,7 @@
#include <sys/types.h>
#if !HAVE_DECL_PIVOT_ROOT
#if !HAVE_PIVOT_ROOT
static inline int pivot_root(const char *new_root, const char *put_old) {
return syscall(SYS_pivot_root, new_root, put_old);
}
@ -32,7 +32,7 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
/* ======================================================================= */
#if !HAVE_DECL_MEMFD_CREATE
#if !HAVE_MEMFD_CREATE
# ifndef __NR_memfd_create
# if defined __x86_64__
# define __NR_memfd_create 319
@ -73,7 +73,7 @@ static inline int memfd_create(const char *name, unsigned int flags) {
/* ======================================================================= */
#if !HAVE_DECL_GETRANDOM
#if !HAVE_GETRANDOM
# ifndef __NR_getrandom
# if defined __x86_64__
# define __NR_getrandom 318
@ -120,7 +120,7 @@ static inline int getrandom(void *buffer, size_t count, unsigned flags) {
/* ======================================================================= */
#if !HAVE_DECL_GETTID
#if !HAVE_GETTID
static inline pid_t gettid(void) {
return (pid_t) syscall(SYS_gettid);
}
@ -128,7 +128,7 @@ static inline pid_t gettid(void) {
/* ======================================================================= */
#if !HAVE_DECL_NAME_TO_HANDLE_AT
#if !HAVE_NAME_TO_HANDLE_AT
# ifndef __NR_name_to_handle_at
# if defined(__x86_64__)
# define __NR_name_to_handle_at 303
@ -163,7 +163,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
/* ======================================================================= */
#if !HAVE_DECL_SETNS
#if !HAVE_SETNS
# ifndef __NR_setns
# if defined(__x86_64__)
# define __NR_setns 308
@ -198,7 +198,7 @@ static inline pid_t raw_getpid(void) {
/* ======================================================================= */
#if !HAVE_DECL_RENAMEAT2
#if !HAVE_RENAMEAT2
# ifndef __NR_renameat2
# if defined __x86_64__
# define __NR_renameat2 316
@ -241,7 +241,7 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
/* ======================================================================= */
#if !HAVE_DECL_KCMP
#if !HAVE_KCMP
static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) {
# ifdef __NR_kcmp
return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2);
@ -254,7 +254,7 @@ static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, uns
/* ======================================================================= */
#if !HAVE_DECL_KEYCTL
#if !HAVE_KEYCTL
static inline long keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4,unsigned long arg5) {
# ifdef __NR_keyctl
return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5);
@ -285,7 +285,7 @@ static inline key_serial_t request_key(const char *type, const char *description
/* ======================================================================= */
#if !HAVE_DECL_COPY_FILE_RANGE
#if !HAVE_COPY_FILE_RANGE
# ifndef __NR_copy_file_range
# if defined(__x86_64__)
# define __NR_copy_file_range 326
@ -319,7 +319,7 @@ static inline ssize_t copy_file_range(int fd_in, loff_t *off_in,
}
#endif
#if !HAVE_DECL_BPF
#if !HAVE_BPF
# ifndef __NR_bpf
# if defined __i386__
# define __NR_bpf 357

2
src/basic/string-util.c
View File

@ -826,7 +826,7 @@ int free_and_strdup(char **p, const char *s) {
return 1;
}
#if !HAVE_DECL_EXPLICIT_BZERO
#if !HAVE_EXPLICIT_BZERO
/*
* Pointer to memset is volatile so that compiler must de-reference
* the pointer and can't assume that it points to any function in

2
src/basic/string-util.h
View File

@ -189,7 +189,7 @@ static inline void *memmem_safe(const void *haystack, size_t haystacklen, const
return memmem(haystack, haystacklen, needle, needlelen);
}
#if !HAVE_DECL_EXPLICIT_BZERO
#if !HAVE_EXPLICIT_BZERO
void explicit_bzero(void *p, size_t l);
#endif