diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-11-12 20:35:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-12 20:35:27 -0500 |
commit | 27b930df24b59fdbc8996f86e702849e8a3678b1 (patch) | |
tree | 52157267467d84cd9ce83265ca4b600b1b802af1 | |
parent | Merge pull request #3116 from harishkrupo/master (diff) | |
parent | Use #if instead of #ifdef for WLR_HAS_* (diff) | |
download | sway-27b930df24b59fdbc8996f86e702849e8a3678b1.tar.gz sway-27b930df24b59fdbc8996f86e702849e8a3678b1.tar.zst sway-27b930df24b59fdbc8996f86e702849e8a3678b1.zip |
Merge pull request #3117 from emersion/wlroots-config10
Use #if instead of #ifdef for WLR_HAS_*
-rw-r--r-- | include/stringop.h | 7 | ||||
-rw-r--r-- | meson.build | 16 | ||||
-rw-r--r-- | sway/commands/create_output.c | 4 | ||||
-rw-r--r-- | sway/desktop/output.c | 9 |
4 files changed, 14 insertions, 22 deletions
diff --git a/include/stringop.h b/include/stringop.h index 01bbdaa9..919e605c 100644 --- a/include/stringop.h +++ b/include/stringop.h | |||
@@ -1,12 +1,7 @@ | |||
1 | #ifndef _SWAY_STRINGOP_H | 1 | #ifndef _SWAY_STRINGOP_H |
2 | #define _SWAY_STRINGOP_H | 2 | #define _SWAY_STRINGOP_H |
3 | #include <stdlib.h> | ||
4 | #include "list.h" | ||
5 | 3 | ||
6 | #if !HAVE_DECL_SETENV | 4 | #include "list.h" |
7 | // Not sure why we need to provide this | ||
8 | extern int setenv(const char *, const char *, int); | ||
9 | #endif | ||
10 | 5 | ||
11 | // array of whitespace characters to use for delims | 6 | // array of whitespace characters to use for delims |
12 | extern const char whitespace[]; | 7 | extern const char whitespace[]; |
diff --git a/meson.build b/meson.build index 6b23b4e3..8327b763 100644 --- a/meson.build +++ b/meson.build | |||
@@ -9,11 +9,17 @@ project( | |||
9 | ], | 9 | ], |
10 | ) | 10 | ) |
11 | 11 | ||
12 | add_project_arguments('-Wno-unused-parameter', language: 'c') | 12 | add_project_arguments( |
13 | add_project_arguments('-Wno-unused-function', language: 'c') | 13 | [ |
14 | add_project_arguments('-Wno-unused-result', language: 'c') | 14 | '-DWL_HIDE_DEPRECATED', |
15 | add_project_arguments('-DWL_HIDE_DEPRECATED', language: 'c') | 15 | '-DWLR_USE_UNSTABLE', |
16 | add_project_arguments('-DWLR_USE_UNSTABLE', language: 'c') | 16 | |
17 | '-Wno-unused-parameter', | ||
18 | '-Wno-unused-result', | ||
19 | '-Wundef', | ||
20 | ], | ||
21 | language: 'c', | ||
22 | ) | ||
17 | 23 | ||
18 | cc = meson.get_compiler('c') | 24 | cc = meson.get_compiler('c') |
19 | 25 | ||
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 |