use "Out of memory." consistantly (or with "\n")

[elogind.git] / src / core / service.h

diff --git a/src/core/service.h b/src/core/service.h
index 819672f61770b9578413c5653de483e1296fd66f..cc63347c76adbb032eb509880179ef154a31eb66 100644 (file)
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef fooservicehfoo
-#define fooservicehfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -28,6 +27,7 @@ typedef struct Service Service;
 #include "path.h"
 #include "ratelimit.h"
 #include "service.h"
+#include "kill.h"
 
 typedef enum ServiceState {
         SERVICE_DEAD,
@@ -127,7 +127,9 @@ struct Service {
         Watch watchdog_watch;
 
         ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
+
         ExecContext exec_context;
+        KillContext kill_context;
 
         ServiceState state, deserialized_state;
 
@@ -164,15 +166,15 @@ struct Service {
         bool bus_name_good:1;
         bool forbid_restart:1;
         bool got_socket_fd:1;
+        bool timeout_defined:1;
 #ifdef HAVE_SYSV_COMPAT
+        bool is_sysv:1;
         bool sysv_has_lsb:1;
         bool sysv_enabled:1;
         int sysv_start_priority_from_rcnd;
         int sysv_start_priority;
 
-        char *sysv_path;
         char *sysv_runlevels;
-        usec_t sysv_mtime;
 #endif
 
         char *bus_name;
@@ -182,7 +184,6 @@ struct Service {
         RateLimit start_limit;
         StartLimitAction start_limit_action;
 
-
         UnitRef accept_socket;
 
         Watch timer_watch;
@@ -217,5 +218,3 @@ ServiceResult service_result_from_string(const char *s);
 
 const char* start_limit_action_to_string(StartLimitAction i);
 StartLimitAction start_limit_action_from_string(const char *s);
-
-#endif