X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Ftimer.h;h=9d919e4d3ea85090f6d7da35a4c079a6cd0d21c5;hb=f5b51ea7fcb0b6380c3ceb4d4f3f22f647c6fd32;hp=712cced29682c4a97d6914dfad9155ad7a861df7;hpb=06642d1795382a4849aa750ee54238f91e2f3126;p=elogind.git

diff --git a/src/core/timer.h b/src/core/timer.h
index 712cced29..9d919e4d3 100644
--- a/src/core/timer.h
+++ b/src/core/timer.h
@@ -23,7 +23,6 @@
 
 typedef struct Timer Timer;
 
-#include "unit.h"
 #include "calendarspec.h"
 
 typedef enum TimerState {
@@ -50,7 +49,6 @@ typedef enum TimerBase {
 typedef struct TimerValue {
         TimerBase base;
         bool disabled;
-        clockid_t clock_id;
 
         usec_t value; /* only for monotonic events */
         CalendarSpec *calendar_spec; /* only for calendar events */
@@ -72,8 +70,9 @@ struct Timer {
         usec_t accuracy_usec;
 
         LIST_HEAD(TimerValue, values);
-        usec_t next_elapse_monotonic;
         usec_t next_elapse_realtime;
+        usec_t next_elapse_monotonic_or_boottime;
+        dual_timestamp last_trigger;
 
         TimerState state, deserialized_state;
 
@@ -83,8 +82,7 @@ struct Timer {
         TimerResult result;
 
         bool persistent;
-
-        dual_timestamp last_trigger;
+        bool wake_system;
 
         char *stamp_path;
 };