X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fswap.h;h=c51c55f839f620b180864afccac8a6fbb1beee31;hb=92b315dfb482626ca6c98b67cd862e4af483a499;hp=ff12169b6822a03347977700608025dba6e59d19;hpb=6b1dc2bd3cdb3bd932b0692be636ddd2879edb92;p=elogind.git

diff --git a/src/core/swap.h b/src/core/swap.h
index ff12169b6..c51c55f83 100644
--- a/src/core/swap.h
+++ b/src/core/swap.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef fooswaphfoo
-#define fooswaphfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -88,6 +87,8 @@ struct Swap {
 
         ExecCommand exec_command[_SWAP_EXEC_COMMAND_MAX];
         ExecContext exec_context;
+        KillContext kill_context;
+        CGroupContext cgroup_context;
 
         SwapState state, deserialized_state;
 
@@ -95,7 +96,7 @@ struct Swap {
         SwapExecCommand control_command_id;
         pid_t control_pid;
 
-        Watch timer_watch;
+        sd_event_source *timer_event_source;
 
         /* In order to be able to distinguish dependencies on
         different device nodes we might end up creating multiple
@@ -106,18 +107,11 @@ struct Swap {
 
 extern const UnitVTable swap_vtable;
 
-int swap_add_one_mount_link(Swap *s, Mount *m);
+const char* swap_state_to_string(SwapState i) _const_;
+SwapState swap_state_from_string(const char *s) _pure_;
 
-int swap_dispatch_reload(Manager *m);
-int swap_fd_event(Manager *m, int events);
+const char* swap_exec_command_to_string(SwapExecCommand i) _const_;
+SwapExecCommand swap_exec_command_from_string(const char *s) _pure_;
 
-const char* swap_state_to_string(SwapState i);
-SwapState swap_state_from_string(const char *s);
-
-const char* swap_exec_command_to_string(SwapExecCommand i);
-SwapExecCommand swap_exec_command_from_string(const char *s);
-
-const char* swap_result_to_string(SwapResult i);
-SwapResult swap_result_from_string(const char *s);
-
-#endif
+const char* swap_result_to_string(SwapResult i) _const_;
+SwapResult swap_result_from_string(const char *s) _pure_;