From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 Mar 2019 11:46:07 +0000 (+0100)
Subject: util: don't include util.h from def.h
X-Git-Tag: v242-rc1~130^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfb4a8494257d2cc44b0347dd59e969dc0e0ef0b;p=thirdparty%2Fsystemd.git

util: don't include util.h from def.h

Nothing it defines is used in it.
---

diff --git a/src/basic/def.h b/src/basic/def.h
index c354c706a74..2af0b763f05 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include "util.h"
-
 #define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 #define DEFAULT_CONFIRM_USEC (30*USEC_PER_SEC)
diff --git a/src/test/test-util.c b/src/test/test-util.c
index 1920cbc84a2..120baa35937 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -5,10 +5,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "def.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "limits-util.h"
+#include "memory-util.h"
 #include "missing_syscall.h"
 #include "parse-util.h"
 #include "process-util.h"
@@ -16,7 +16,7 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "tests.h"
-#include "memory-util.h"
+#include "util.h"
 
 static void test_align_power2(void) {
         unsigned long i, p2;