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 f2515ab86f00140d27bf19920cfab1e233b73db2..7b3ac8999d50df7de6bf85396a2bc8ee53dd25e4 100644 (file)
--- 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 fc601476935a879962131d5e13785bc62a5547d5..4e5bbccae07466ebb520a2213c88ee92326df04b 100644 (file)
--- 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 f708dcfa146371fa8acd6b38fca123c89d9d0f11..ed32f0305a8ee8c00d62ea838b4b5e322f0cef0c 100644 (file)
--- 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"