summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorMike Gilbert <floppymaster@gmail.com>2017-01-10 02:39:05 -0500
committerMartin Pitt <martin.pitt@ubuntu.com>2017-01-10 08:39:05 +0100
commitc9f7b4d356a453a01aa77a6bb74ca7ef49732c08 (patch)
tree2a12f9a2e94d9fafe07af88d2eee2ee958f05c40 /src/network
parent64083a6078630372623bb1013a45d3bf31d8a836 (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/netdev/netdev.h2
-rw-r--r--src/network/networkd-conf.h2
-rw-r--r--src/network/networkd-network.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h
index 70ff947b99..37c7431213 100644
--- a/src/network/netdev/netdev.h
+++ b/src/network/netdev/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-conf.h b/src/network/networkd-conf.h
index 93819626ba..1136975a5e 100644
--- a/src/network/networkd-conf.h
+++ b/src/network/networkd-conf.h
@@ -23,7 +23,7 @@ typedef struct Manager Manager;
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-network.h b/src/network/networkd-network.h
index 4cf784f67c..b7da9d22d4 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -244,7 +244,7 @@ int config_parse_ntp(const char *unit, const char *filename, unsigned line, cons
/* 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[];