diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-06 16:49:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-06 16:49:46 -0400 |
| commit | 8b3a6039faff5b2df79626172fcb1df816e3e9a6 (patch) | |
| tree | b3c6337bb591848e259523d1e99895ee83ca1ca4 /src/grp-udev | |
| parent | cbf74de439b6c0334596a9fd461aad2f4552e7fe (diff) | |
| parent | 57113f5edeb70b391bb0d93ccee457829fc4b64f (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
Diffstat (limited to 'src/grp-udev')
| -rw-r--r-- | src/grp-udev/libudev-core/net/link-config.h | 2 | ||||
| -rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-keyboard.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/grp-udev/libudev-core/net/link-config.h b/src/grp-udev/libudev-core/net/link-config.h index 59c1780d70..0040dd2b42 100644 --- a/src/grp-udev/libudev-core/net/link-config.h +++ b/src/grp-udev/libudev-core/net/link-config.h @@ -94,7 +94,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_; MACPolicy mac_policy_from_string(const char *p) _pure_; /* gperf lookup function */ -const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length); +const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length); int config_parse_mac_policy(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_name_policy(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); diff --git a/src/grp-udev/libudev-core/udev-builtin-keyboard.c b/src/grp-udev/libudev-core/udev-builtin-keyboard.c index 22faeb488b..32792260c8 100644 --- a/src/grp-udev/libudev-core/udev-builtin-keyboard.c +++ b/src/grp-udev/libudev-core/udev-builtin-keyboard.c @@ -30,7 +30,7 @@ #include "systemd-basic/string-util.h" #include "udev.h" -static const struct key *keyboard_lookup_key(const char *str, unsigned len); +static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len); #include "keyboard-keys-from-name.h" static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) { |