From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 24 Aug 2021 15:19:03 +0000 (+0100)
Subject: core: Remove circular include
X-Git-Tag: v250-rc1~778^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a243128d1fcfc378df9fce1b4997148a17ef23a5;p=thirdparty%2Fsystemd.git

core: Remove circular include

service.h includes socket.h and socket.h includes service.h. Move
service.h include from socket.h to socket.c to remove the circular
dependency.
---

diff --git a/src/core/socket.c b/src/core/socket.c
index 675ad3c0250..ceaf39bdd3e 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -34,6 +34,7 @@
 #include "process-util.h"
 #include "selinux-util.h"
 #include "serialize.h"
+#include "service.h"
 #include "signal-util.h"
 #include "smack-util.h"
 #include "socket.h"
diff --git a/src/core/socket.h b/src/core/socket.h
index a65195f2aac..6813bdcf8c8 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -5,7 +5,6 @@ typedef struct Socket Socket;
 typedef struct SocketPeer SocketPeer;
 
 #include "mount.h"
-#include "service.h"
 #include "socket-util.h"
 #include "unit.h"