diff options
author | thermitegod <thermitethegod@gmail.com> | 2020-01-23 18:12:00 -0700 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-01-24 10:16:59 +0100 |
commit | 29a5ce5f65d04b046271fbe53850836c77bbee80 (patch) | |
tree | a4ebc08ab43efd4785040ca8d30134f615d9ae47 | |
parent | Adding the link to the Portuguese on the English version of README.md (diff) | |
download | sway-29a5ce5f65d04b046271fbe53850836c77bbee80.tar.gz sway-29a5ce5f65d04b046271fbe53850836c77bbee80.tar.zst sway-29a5ce5f65d04b046271fbe53850836c77bbee80.zip |
Fix compiling with -fno-common
-rw-r--r-- | include/sway/server.h | 4 | ||||
-rw-r--r-- | sway/main.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 5b34852c..2e8e4633 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -78,7 +78,7 @@ struct sway_server { | |||
78 | list_t *dirty_nodes; | 78 | list_t *dirty_nodes; |
79 | }; | 79 | }; |
80 | 80 | ||
81 | struct sway_server server; | 81 | extern struct sway_server server; |
82 | 82 | ||
83 | struct sway_debug { | 83 | struct sway_debug { |
84 | bool noatomic; // Ignore atomic layout updates | 84 | bool noatomic; // Ignore atomic layout updates |
@@ -92,7 +92,7 @@ struct sway_debug { | |||
92 | } damage; | 92 | } damage; |
93 | }; | 93 | }; |
94 | 94 | ||
95 | struct sway_debug debug; | 95 | extern struct sway_debug debug; |
96 | 96 | ||
97 | /* Prepares an unprivileged server_init by performing all privileged operations in advance */ | 97 | /* Prepares an unprivileged server_init by performing all privileged operations in advance */ |
98 | bool server_privileged_prepare(struct sway_server *server); | 98 | bool server_privileged_prepare(struct sway_server *server); |
diff --git a/sway/main.c b/sway/main.c index 2cc69dfb..e0af4a79 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -27,6 +27,7 @@ | |||
27 | static bool terminate_request = false; | 27 | static bool terminate_request = false; |
28 | static int exit_value = 0; | 28 | static int exit_value = 0; |
29 | struct sway_server server = {0}; | 29 | struct sway_server server = {0}; |
30 | struct sway_debug debug = {0}; | ||
30 | 31 | ||
31 | void sway_terminate(int exit_code) { | 32 | void sway_terminate(int exit_code) { |
32 | if (!server.wl_display) { | 33 | if (!server.wl_display) { |