diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-23 16:26:20 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-23 16:26:20 +1000 |
commit | b11c9199a61775d7ed441c68238e11e93fbd6d21 (patch) | |
tree | 57c20e5ed9254c8025854175087033347aae768c /include | |
parent | Implement atomic layout updates for tree operations (diff) | |
parent | Merge pull request #2155 from ael-code/fix_output_command_failure (diff) | |
download | sway-b11c9199a61775d7ed441c68238e11e93fbd6d21.tar.gz sway-b11c9199a61775d7ed441c68238e11e93fbd6d21.tar.zst sway-b11c9199a61775d7ed441c68238e11e93fbd6d21.zip |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/server.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index f5f88a5a..b07e86a7 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -54,6 +54,8 @@ struct sway_server { | |||
54 | 54 | ||
55 | struct sway_server server; | 55 | struct sway_server server; |
56 | 56 | ||
57 | /* Prepares an unprivileged server_init by performing all privileged operations in advance */ | ||
58 | bool server_privileged_prepare(struct sway_server *server); | ||
57 | bool server_init(struct sway_server *server); | 59 | bool server_init(struct sway_server *server); |
58 | void server_fini(struct sway_server *server); | 60 | void server_fini(struct sway_server *server); |
59 | void server_run(struct sway_server *server); | 61 | void server_run(struct sway_server *server); |