X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Futil.c;h=8f2317f2852906c81cd21991ffbed22ae3593927;hb=66ecc207e203db5434610395cd04c40ae8727b58;hp=998fa7f1e25babb80ee675baa39dd5fa2a86a5fc;hpb=4f8a2329ef626675895974d53a6afad68a0d255a;p=elogind.git
diff --git a/src/basic/util.c b/src/basic/util.c
index 998fa7f1e..8f2317f28 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,92 +17,46 @@
along with systemd; If not, see .
***/
-//#include
+#include
//#include
//#include
//#include
-//#include
-//#include
-//#include
-//#include
-//#include
-//#include
-//#include
-//#include
-//#include
-//#include
#include
//#include
//#include
//#include
-//#include
+#include
//#include
-//#include
-//#include
//#include
-//#include
-//#include
#include
-//#include
-//#include
-//#include
+#include
+#include
//#include
-//#include
-//#include
-//#include
-//#include
//#include
-/* When we include libgen.h because we need dirname() we immediately
- * undefine basename() since libgen.h defines it as a macro to the
- * POSIX version which is really broken. We prefer GNU basename(). */
-//#include
-//#undef basename
-
-#ifdef HAVE_SYS_AUXV_H
-#include
-#endif
-
-/* We include linux/fs.h as last of the system headers, as it
- * otherwise conflicts with sys/mount.h. Yay, Linux is great! */
-//#include
-
#include "alloc-util.h"
#include "build.h"
//#include "def.h"
-//#include "device-nodes.h"
#include "dirent-util.h"
-//#include "env-util.h"
-//#include "escape.h"
-//#include "exit-status.h"
#include "fd-util.h"
#include "fileio.h"
//#include "formats-util.h"
-//#include "gunicode.h"
#include "hashmap.h"
-//#include "hexdecoct.h"
#include "hostname-util.h"
-//#include "ioprio.h"
//#include "log.h"
#include "macro.h"
//#include "missing.h"
-//#include "mkdir.h"
#include "parse-util.h"
//#include "path-util.h"
#include "process-util.h"
-//#include "random-util.h"
-#include "signal-util.h"
#include "set.h"
-//#include "sparse-endian.h"
+#include "signal-util.h"
#include "stat-util.h"
-//#include "string-table.h"
#include "string-util.h"
#include "strv.h"
-//#include "terminal-util.h"
+#include "time-util.h"
#include "user-util.h"
-//#include "utf8.h"
#include "util.h"
-//#include "virt.h"
/* Put this test here for a lack of better place */
assert_cc(EAGAIN == EWOULDBLOCK);