diff options
author | 2018-11-12 22:23:06 +0100 | |
---|---|---|
committer | 2018-11-12 22:23:06 +0100 | |
commit | 2afd930914c9d31ed1da5ffd80b18f029e84f8c5 (patch) | |
tree | 52157267467d84cd9ce83265ca4b600b1b802af1 /sway | |
parent | Merge pull request #3116 from harishkrupo/master (diff) | |
download | sway-2afd930914c9d31ed1da5ffd80b18f029e84f8c5.tar.gz sway-2afd930914c9d31ed1da5ffd80b18f029e84f8c5.tar.zst sway-2afd930914c9d31ed1da5ffd80b18f029e84f8c5.zip |
Use #if instead of #ifdef for WLR_HAS_*
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/create_output.c | 4 | ||||
-rw-r--r-- | sway/desktop/output.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sway/commands/create_output.c b/sway/commands/create_output.c index 1c2464ea..3f870acb 100644 --- a/sway/commands/create_output.c +++ b/sway/commands/create_output.c | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <wlr/config.h> | 1 | #include <wlr/config.h> |
2 | #include <wlr/backend/multi.h> | 2 | #include <wlr/backend/multi.h> |
3 | #include <wlr/backend/wayland.h> | 3 | #include <wlr/backend/wayland.h> |
4 | #ifdef WLR_HAS_X11_BACKEND | 4 | #if WLR_HAS_X11_BACKEND |
5 | #include <wlr/backend/x11.h> | 5 | #include <wlr/backend/x11.h> |
6 | #endif | 6 | #endif |
7 | #include "sway/commands.h" | 7 | #include "sway/commands.h" |
@@ -18,7 +18,7 @@ static void create_output(struct wlr_backend *backend, void *data) { | |||
18 | wlr_wl_output_create(backend); | 18 | wlr_wl_output_create(backend); |
19 | *done = true; | 19 | *done = true; |
20 | } | 20 | } |
21 | #ifdef WLR_HAS_X11_BACKEND | 21 | #if WLR_HAS_X11_BACKEND |
22 | else if (wlr_backend_is_x11(backend)) { | 22 | else if (wlr_backend_is_x11(backend)) { |
23 | wlr_x11_output_create(backend); | 23 | wlr_x11_output_create(backend); |
24 | *done = true; | 24 | *done = true; |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index d48ddef3..c53a9c73 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -469,15 +469,6 @@ void output_damage_box(struct sway_output *output, struct wlr_box *_box) { | |||
469 | wlr_output_damage_add_box(output->damage, &box); | 469 | wlr_output_damage_add_box(output->damage, &box); |
470 | } | 470 | } |
471 | 471 | ||
472 | static void output_damage_whole_container_iterator(struct sway_container *con, | ||
473 | void *data) { | ||
474 | if (!sway_assert(con->view, "expected a view")) { | ||
475 | return; | ||
476 | } | ||
477 | struct sway_output *output = data; | ||
478 | output_damage_view(output, con->view, true); | ||
479 | } | ||
480 | |||
481 | void output_damage_whole_container(struct sway_output *output, | 472 | void output_damage_whole_container(struct sway_output *output, |
482 | struct sway_container *con) { | 473 | struct sway_container *con) { |
483 | // Pad the box by 1px, because the width is a double and might be a fraction | 474 | // Pad the box by 1px, because the width is a double and might be a fraction |