diff options
author | Mike Gilbert <floppymaster@gmail.com> | 2017-01-10 02:39:05 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-06 16:39:36 -0400 |
commit | 3384b776817808f01979ce192603d0c901391fd4 (patch) | |
tree | 941b7dda05e4a3d4f5d1bfb52122ee0d16ebda05 /src/network | |
parent | 6a2346a433c6ba1e372d270a4b3a5c62f431038a (diff) |
build-sys: add check for gperf lookup function signature (#5055)
gperf-3.1 generates lookup functions that take a size_t length
parameter instead of unsigned int. Test for this at configure time.
Fixes: https://github.com/systemd/systemd/issues/5039
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/networkd-conf.h | 2 | ||||
-rw-r--r-- | src/network/networkd-netdev.h | 2 | ||||
-rw-r--r-- | src/network/networkd-network.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h index c7bfb42a72..00ddb7672a 100644 --- a/src/network/networkd-conf.h +++ b/src/network/networkd-conf.h @@ -23,7 +23,7 @@ int manager_parse_config_file(Manager *m); -const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length); +const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TYPE length); int config_parse_duid_type( const char *unit, diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h index 70ff947b99..37c7431213 100644 --- a/src/network/networkd-netdev.h +++ b/src/network/networkd-netdev.h @@ -175,7 +175,7 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_; int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); /* gperf */ -const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length); +const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length); /* Macros which append INTERFACE= to the message */ diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 42fc82d392..09c3b3a3ae 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -236,7 +236,7 @@ int config_parse_dhcp_route_table(const char *unit, const char *filename, unsign /* Legacy IPv4LL support */ int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length); +const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length); extern const sd_bus_vtable network_vtable[]; |