From: Sven Eden <yamakuzure@gmx.net>
Date: Tue, 25 Jul 2017 09:41:55 +0000 (+0200)
Subject: Prep v234: Apply missing upstream fixes in src/shared (4/6)
X-Git-Tag: chiark/234.4-1+devuan1.1+iwj1~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=627d9a980cae493247e7ace980256e9909760bc4;ds=sidebyside

Prep v234: Apply missing upstream fixes in src/shared (4/6)
---

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index f2515ab86..7b3ac8999 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -978,7 +978,6 @@ int config_parse_ifname(
 
         return 0;
 }
-#endif // 0
 
 int config_parse_ip_port(
                 const char *unit,
@@ -1016,3 +1015,4 @@ int config_parse_ip_port(
 
         return 0;
 }
+#endif // 0
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index fc6014769..4e5bbccae 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -153,8 +153,8 @@ int config_parse_signal(const char *unit, const char *filename, unsigned line, c
 #if 0 /// UNNEEDED by elogind
 int config_parse_personality(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_ifname(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);
-#endif // 0
 int config_parse_ip_port(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);
+#endif // 0
 
 #define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg)                \
         int function(const char *unit,                                  \
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index f708dcfa1..ed32f0305 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -19,6 +19,7 @@
 
 #include <string.h>
 
+#include "alloc-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "string-util.h"