summaryrefslogtreecommitdiff
path: root/src/nspawn
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-05-06 16:47:17 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-05-06 16:47:17 -0400
commit6ecbde8f5a65b922809dd7c077ed8494ca4a7bc9 (patch)
treeb16890fc5e30035c3752bcaa0609407f80fe835e /src/nspawn
parent1841fdb0b10cb37b55d1af644a7e6edc4ab66cbd (diff)
parentae81fab1d9133f46d5c2d9243e796e9534cb715a (diff)
Merge branch 'systemd/parabola' into notsystemd/premove
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn-settings.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
index 231e6d7266..4ae34f8e28 100644
--- a/src/nspawn/nspawn-settings.h
+++ b/src/nspawn/nspawn-settings.h
@@ -103,7 +103,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);