unit: properly update references to units which are merged

[elogind.git] / src / service.h

diff --git a/src/service.h b/src/service.h
index 15d58cc8ca984a76c32a209df67868a399f717a9..8f67ad50a806f583bf43dd95a8744245e9172d0a 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -25,7 +25,9 @@
 typedef struct Service Service;
 
 #include "unit.h"
+#include "path.h"
 #include "ratelimit.h"
+#include "service.h"
 
 typedef enum ServiceState {
         SERVICE_DEAD,
@@ -86,8 +88,6 @@ typedef enum NotifyAccess {
         _NOTIFY_ACCESS_INVALID = -1
 } NotifyAccess;
 
-typedef struct PathSpec PathSpec;
-
 struct Service {
         Meta meta;
 
@@ -155,8 +155,7 @@ struct Service {
 
         RateLimit ratelimit;
 
-        struct Socket *accept_socket;
-        Set *configured_sockets;
+        UnitRef accept_socket;
 
         Watch timer_watch;
         PathSpec *pid_file_pathspec;
@@ -166,6 +165,8 @@ struct Service {
 
 extern const UnitVTable service_vtable;
 
+struct Socket;
+
 int service_set_socket_fd(Service *s, int fd, struct Socket *socket);
 
 const char* service_state_to_string(ServiceState i);