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/systemd-nspawn | |
| parent | cbf74de439b6c0334596a9fd461aad2f4552e7fe (diff) | |
| parent | 57113f5edeb70b391bb0d93ccee457829fc4b64f (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
Diffstat (limited to 'src/systemd-nspawn')
| -rw-r--r-- | src/systemd-nspawn/nspawn-settings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/systemd-nspawn/nspawn-settings.h b/src/systemd-nspawn/nspawn-settings.h index 5274daf80d..2e57072eec 100644 --- a/src/systemd-nspawn/nspawn-settings.h +++ b/src/systemd-nspawn/nspawn-settings.h @@ -104,7 +104,7 @@ bool settings_private_network(Settings *s); DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free); -const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length); +const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, GPERF_LEN_TYPE length); int config_parse_capability(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_id128(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); |