chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix assertion failure when resuming from sleep/suspend
[elogind.git]
/
src
/
login
/
logind-action.h
diff --git
a/src/login/logind-action.h
b/src/login/logind-action.h
index df080d98ed17ceb28bb6031000bbb85ec279b67d..6b63b92d3c5e2c62432b8d938c4709f9ce62f8ee 100644
(file)
--- a/
src/login/logind-action.h
+++ b/
src/login/logind-action.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foologindactionhfoo
-#define foologindactionhfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-23,7
+22,7
@@
***/
typedef enum HandleAction {
***/
typedef enum HandleAction {
- HANDLE_IGNORE,
+ HANDLE_IGNORE
= 0
,
HANDLE_POWEROFF,
HANDLE_REBOOT,
HANDLE_HALT,
HANDLE_POWEROFF,
HANDLE_REBOOT,
HANDLE_HALT,
@@
-37,7
+36,6
@@
typedef enum HandleAction {
} HandleAction;
#include "logind.h"
} HandleAction;
#include "logind.h"
-#include "logind-inhibit.h"
int manager_handle_action(
Manager *m,
int manager_handle_action(
Manager *m,
@@
-46,9
+44,9
@@
int manager_handle_action(
bool ignore_inhibited,
bool is_edge);
bool ignore_inhibited,
bool is_edge);
-const char* handle_action_to_string(HandleAction h);
-HandleAction handle_action_from_string(const char *s);
+int shutdown_or_sleep(Manager *m, HandleAction action);
-int config_parse_handle_action(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+const char* handle_action_to_string(HandleAction h) _const_;
+HandleAction handle_action_from_string(const char *s) _pure_;
-#endif
+int config_parse_handle_action(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);