diff options
-rw-r--r-- | src/basic/arphrd-list.c | 1 | ||||
-rwxr-xr-x | src/basic/generate-af-list.sh | 2 | ||||
-rwxr-xr-x | src/basic/generate-arphrd-list.sh | 2 | ||||
-rw-r--r-- | src/basic/meson.build | 6 | ||||
-rw-r--r-- | src/test/test-arphrd-list.c | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c index 8652863cac..b6e2486b67 100644 --- a/src/basic/arphrd-list.c +++ b/src/basic/arphrd-list.c @@ -6,6 +6,7 @@ #include "arphrd-list.h" #include "macro.h" +#include "missing_network.h" static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); diff --git a/src/basic/generate-af-list.sh b/src/basic/generate-af-list.sh index 39e2dad5e7..5bf244c49d 100755 --- a/src/basic/generate-af-list.sh +++ b/src/basic/generate-af-list.sh @@ -1,6 +1,6 @@ #!/bin/sh set -eu -$1 -E -dM -include sys/socket.h - </dev/null | \ +$1 -E -dM -include sys/socket.h -include "$2" -include "$3" - </dev/null | \ grep -Ev 'AF_UNSPEC|AF_MAX' | \ awk '/^#define[ \t]+AF_[^ \t]+[ \t]+[AP]F_[^ \t]/ { print $2; }' diff --git a/src/basic/generate-arphrd-list.sh b/src/basic/generate-arphrd-list.sh index e4e7271c4d..e6e874a8fd 100755 --- a/src/basic/generate-arphrd-list.sh +++ b/src/basic/generate-arphrd-list.sh @@ -1,6 +1,6 @@ #!/bin/sh set -eu -$1 -dM -include net/if_arp.h - </dev/null | \ +$1 -dM -include net/if_arp.h -include "$2" -include "$3" - </dev/null | \ awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \ sed -e 's/ARPHRD_//' diff --git a/src/basic/meson.build b/src/basic/meson.build index 67acdd2bf9..fb6fa2fcfa 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -212,19 +212,21 @@ basic_sources = files(''' missing_audit_h = files('missing_audit.h') missing_capability_h = files('missing_capability.h') +missing_network_h = files('missing_network.h') +missing_socket_h = files('missing_socket.h') generate_af_list = find_program('generate-af-list.sh') af_list_txt = custom_target( 'af-list.txt', output : 'af-list.txt', - command : [generate_af_list, cpp], + command : [generate_af_list, cpp, config_h, missing_socket_h], capture : true) generate_arphrd_list = find_program('generate-arphrd-list.sh') arphrd_list_txt = custom_target( 'arphrd-list.txt', output : 'arphrd-list.txt', - command : [generate_arphrd_list, cpp], + command : [generate_arphrd_list, cpp, config_h, missing_network_h], capture : true) generate_cap_list = find_program('generate-cap-list.sh') diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c index 9803c53f21..3005fc1b69 100644 --- a/src/test/test-arphrd-list.c +++ b/src/test/test-arphrd-list.c @@ -4,8 +4,8 @@ #include <string.h> #include "macro.h" +#include "missing_network.h" #include "string-util.h" -#include "util.h" _unused_ \ static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); |