diff options
author | Pascal Pascher <pascalpascher@gmx.net> | 2018-07-25 13:43:21 +0200 |
---|---|---|
committer | Pascal Pascher <pascalpascher@gmx.net> | 2018-07-25 13:43:21 +0200 |
commit | 384c55c0b465d6b9a9c4cb88d8752435ac5cf708 (patch) | |
tree | c5398c9383e2900a6197ef0e1ff0c3969cd3cfbf | |
parent | reverted includes of "sway/config.h" and replaced with "config.h" from meson ... (diff) | |
download | sway-384c55c0b465d6b9a9c4cb88d8752435ac5cf708.tar.gz sway-384c55c0b465d6b9a9c4cb88d8752435ac5cf708.tar.zst sway-384c55c0b465d6b9a9c4cb88d8752435ac5cf708.zip |
more style fixes, reorder config.h include
-rw-r--r-- | sway/criteria.c | 4 | ||||
-rw-r--r-- | sway/tree/view.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sway/criteria.c b/sway/criteria.c index 48899125..39d300ea 100644 --- a/sway/criteria.c +++ b/sway/criteria.c | |||
@@ -270,9 +270,9 @@ enum criteria_token { | |||
270 | T_CON_ID, | 270 | T_CON_ID, |
271 | T_CON_MARK, | 271 | T_CON_MARK, |
272 | T_FLOATING, | 272 | T_FLOATING, |
273 | #ifdef HAVE_XWAYLAND | 273 | #ifdef HAVE_XWAYLAND |
274 | T_ID, | 274 | T_ID, |
275 | #endif | 275 | #endif |
276 | T_INSTANCE, | 276 | T_INSTANCE, |
277 | T_SHELL, | 277 | T_SHELL, |
278 | T_TILING, | 278 | T_TILING, |
diff --git a/sway/tree/view.c b/sway/tree/view.c index f672417e..beeb8144 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -3,12 +3,12 @@ | |||
3 | #include <wayland-server.h> | 3 | #include <wayland-server.h> |
4 | #include <wlr/render/wlr_renderer.h> | 4 | #include <wlr/render/wlr_renderer.h> |
5 | #include <wlr/types/wlr_output_layout.h> | 5 | #include <wlr/types/wlr_output_layout.h> |
6 | #include "config.h" | ||
6 | #ifdef HAVE_XWAYLAND | 7 | #ifdef HAVE_XWAYLAND |
7 | #include <wlr/xwayland.h> | 8 | #include <wlr/xwayland.h> |
8 | #endif | 9 | #endif |
9 | #include "list.h" | 10 | #include "list.h" |
10 | #include "log.h" | 11 | #include "log.h" |
11 | #include "config.h" | ||
12 | #include "sway/criteria.h" | 12 | #include "sway/criteria.h" |
13 | #include "sway/commands.h" | 13 | #include "sway/commands.h" |
14 | #include "sway/ipc-server.h" | 14 | #include "sway/ipc-server.h" |