diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-27 08:16:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-27 08:16:25 -0400 |
commit | fed69768403d236eb464928fc0886a89a6efc1a2 (patch) | |
tree | 2947a0c67b309c57400d19d520cced8eceaa273b | |
parent | Merge pull request #2518 from ianyfan/ipc (diff) | |
parent | Initialise variable properly (diff) | |
download | sway-fed69768403d236eb464928fc0886a89a6efc1a2.tar.gz sway-fed69768403d236eb464928fc0886a89a6efc1a2.tar.zst sway-fed69768403d236eb464928fc0886a89a6efc1a2.zip |
Merge pull request #2522 from ascent12/build_fix
Build fix
-rw-r--r-- | meson.build | 1 | ||||
-rw-r--r-- | sway/commands/move.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 0e4b4f21..d5b33e6b 100644 --- a/meson.build +++ b/meson.build | |||
@@ -12,6 +12,7 @@ project( | |||
12 | add_project_arguments('-Wno-unused-parameter', language: 'c') | 12 | add_project_arguments('-Wno-unused-parameter', language: 'c') |
13 | add_project_arguments('-Wno-unused-function', language: 'c') | 13 | add_project_arguments('-Wno-unused-function', language: 'c') |
14 | add_project_arguments('-Wno-unused-result', language: 'c') | 14 | add_project_arguments('-Wno-unused-result', language: 'c') |
15 | add_project_arguments('-DWL_HIDE_DEPRECATED', language: 'c') | ||
15 | add_project_arguments('-DWLR_USE_UNSTABLE', language: 'c') | 16 | add_project_arguments('-DWLR_USE_UNSTABLE', language: 'c') |
16 | 17 | ||
17 | cc = meson.get_compiler('c') | 18 | cc = meson.get_compiler('c') |
diff --git a/sway/commands/move.c b/sway/commands/move.c index d0f6b9ea..7b7cb8f3 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -52,7 +52,7 @@ static struct sway_container *output_in_direction(const char *direction_string, | |||
52 | { "right", WLR_DIRECTION_RIGHT }, | 52 | { "right", WLR_DIRECTION_RIGHT }, |
53 | }; | 53 | }; |
54 | 54 | ||
55 | enum wlr_direction direction; | 55 | enum wlr_direction direction = 0; |
56 | 56 | ||
57 | for (size_t i = 0; i < sizeof(names) / sizeof(names[0]); ++i) { | 57 | for (size_t i = 0; i < sizeof(names) / sizeof(names[0]); ++i) { |
58 | if (strcasecmp(names[i].name, direction_string) == 0) { | 58 | if (strcasecmp(names[i].name, direction_string) == 0) { |