src/shared: import many code cleanups from upstream

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/shared/conf-files.h b/src/shared/conf-files.h
index a0720dc2cc..b769e56845 100644
--- a/src/shared/conf-files.h
+++ b/src/shared/conf-files.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef fooconffileshfoo
-#define fooconffileshfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -23,6 +22,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-int conf_files_list_strv(char ***strv, const char *suffix, const char *root, const char* const* dirs);
+#include "macro.h"
 
-#endif
+int conf_files_list_strv(char ***strv, const char *suffix, const char *root, const char* const* dirs);