From: Sven Eden Date: Tue, 5 Jun 2018 17:08:31 +0000 (+0200) Subject: Prep v238: Uncomment now needed headers and unmask now needed functions in src/shared... X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=93de44d94d556fb91ee6e34ea42f818b8b41148c;p=elogind.git Prep v238: Uncomment now needed headers and unmask now needed functions in src/shared (5/6) --- diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 3d12baf2d..252a2a042 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -1038,7 +1038,6 @@ int config_parse_ip_port( return 0; } -#endif // 0 int config_parse_join_controllers( const char *unit, @@ -1155,3 +1154,4 @@ int config_parse_join_controllers( return 0; } +#endif // 0 diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index 8555ddb15..776fc844b 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -171,7 +171,9 @@ int config_parse_signal(GENERIC_PARSER_ARGS); int config_parse_personality(GENERIC_PARSER_ARGS); int config_parse_ifname(GENERIC_PARSER_ARGS); int config_parse_ip_port(GENERIC_PARSER_ARGS); +#if 0 /// UNNEEDED by elogind int config_parse_join_controllers(GENERIC_PARSER_ARGS); +#endif // 0 #define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg) \ int function(GENERIC_PARSER_ARGS) { \ diff --git a/src/shared/musl_missing.c b/src/shared/musl_missing.c index 5ce787beb..e089367f2 100644 --- a/src/shared/musl_missing.c +++ b/src/shared/musl_missing.c @@ -1,4 +1,26 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +/*** + This file is part of elogind. + + Copyright 2017 Sven Eden + + elogind is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + elogind is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with elogind; If not, see . +***/ + +#include #include + #include "alloc-util.h" #ifndef __GLIBC__