X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fswap.h;h=35d47fd46f5e87f769221a06726fa654d4127515;hp=2a6fceece2f3a76062047e8c6ad424c6a14bd8ae;hb=3ef63c317481c2b3f1fe39e1b0f130aac3544522;hpb=8d8e945624a0080073d94941f3032b8fa3b3aa15

diff --git a/src/core/swap.h b/src/core/swap.h
index 2a6fceece..35d47fd46 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.
@@ -71,11 +70,9 @@ struct Swap {
 
         char *what;
 
-        SwapParameters parameters_etc_fstab;
         SwapParameters parameters_proc_swaps;
         SwapParameters parameters_fragment;
 
-        bool from_etc_fstab:1;
         bool from_proc_swaps:1;
         bool from_fragment:1;
 
@@ -90,6 +87,7 @@ struct Swap {
 
         ExecCommand exec_command[_SWAP_EXEC_COMMAND_MAX];
         ExecContext exec_context;
+        KillContext kill_context;
 
         SwapState state, deserialized_state;
 
@@ -108,8 +106,6 @@ struct Swap {
 
 extern const UnitVTable swap_vtable;
 
-int swap_add_one(Manager *m, const char *what, const char *what_proc_swaps, int prio, bool no_auto, bool no_fail, bool set_flags);
-
 int swap_add_one_mount_link(Swap *s, Mount *m);
 
 int swap_dispatch_reload(Manager *m);
@@ -123,5 +119,3 @@ 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