chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: don't trim a cgroup we create, we might just take it over from somebody else
[elogind.git]
/
src
/
timer.h
diff --git
a/src/timer.h
b/src/timer.h
index 6510ed2844a19ff73e3eddc1a18811ded6b1ace0..6295605510a0ffd633e2341792415b65a7064dea 100644
(file)
--- a/
src/timer.h
+++ b/
src/timer.h
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
#ifndef footimerhfoo
#define footimerhfoo
#ifndef footimerhfoo
#define footimerhfoo
@@
-31,7
+31,7
@@
typedef enum TimerState {
TIMER_WAITING,
TIMER_RUNNING,
TIMER_ELAPSED,
TIMER_WAITING,
TIMER_RUNNING,
TIMER_ELAPSED,
- TIMER_
MAINTENANCE
,
+ TIMER_
FAILED
,
_TIMER_STATE_MAX,
_TIMER_STATE_INVALID = -1
} TimerState;
_TIMER_STATE_MAX,
_TIMER_STATE_INVALID = -1
} TimerState;
@@
-47,14
+47,13
@@
typedef enum TimerBase {
} TimerBase;
typedef struct TimerValue {
} TimerBase;
typedef struct TimerValue {
- TimerBase base;
usec_t value;
usec_t value;
-
usec_t next_elapse;
usec_t next_elapse;
- bool disabled;
-
LIST_FIELDS(struct TimerValue, value);
LIST_FIELDS(struct TimerValue, value);
+
+ TimerBase base;
+ bool disabled;
} TimerValue;
struct Timer {
} TimerValue;
struct Timer {