diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-06 16:47:17 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-06 16:47:17 -0400 |
| commit | 6ecbde8f5a65b922809dd7c077ed8494ca4a7bc9 (patch) | |
| tree | b16890fc5e30035c3752bcaa0609407f80fe835e /src/resolve | |
| parent | 1841fdb0b10cb37b55d1af644a7e6edc4ab66cbd (diff) | |
| parent | ae81fab1d9133f46d5c2d9243e796e9534cb715a (diff) | |
Merge branch 'systemd/parabola' into notsystemd/premove
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/dns-type.c | 2 | ||||
| -rw-r--r-- | src/resolve/resolved-conf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c index aaf5ed62c1..d89ae28dcd 100644 --- a/src/resolve/dns-type.c +++ b/src/resolve/dns-type.c @@ -29,7 +29,7 @@ typedef const struct { } dns_type; static const struct dns_type_name * -lookup_dns_type (register const char *str, register unsigned int len); +lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len); #include "dns_type-from-name.h" #include "dns_type-to-name.h" diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h index fc425a36b2..8184d6cadf 100644 --- a/src/resolve/resolved-conf.h +++ b/src/resolve/resolved-conf.h @@ -41,7 +41,7 @@ int manager_parse_search_domains_and_warn(Manager *m, const char *string); int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word); int manager_parse_dns_server_string_and_warn(Manager *m, DnsServerType type, const char *string); -const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length); +const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length); int config_parse_dns_servers(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); int config_parse_search_domains(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); |