aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthermitegod <thermitethegod@gmail.com>2020-01-23 18:12:00 -0700
committerSimon Ser <contact@emersion.fr>2020-01-24 10:16:59 +0100
commit29a5ce5f65d04b046271fbe53850836c77bbee80 (patch)
treea4ebc08ab43efd4785040ca8d30134f615d9ae47
parent9c93e1c0ce53fb7776ff29129b53b12694d9abff (diff)
Fix compiling with -fno-common
-rw-r--r--include/sway/server.h4
-rw-r--r--sway/main.c1
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 {
list_t *dirty_nodes;
};
-struct sway_server server;
+extern struct sway_server server;
struct sway_debug {
bool noatomic; // Ignore atomic layout updates
@@ -92,7 +92,7 @@ struct sway_debug {
} damage;
};
-struct sway_debug debug;
+extern struct sway_debug debug;
/* Prepares an unprivileged server_init by performing all privileged operations in advance */
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 @@
static bool terminate_request = false;
static int exit_value = 0;
struct sway_server server = {0};
+struct sway_debug debug = {0};
void sway_terminate(int exit_code) {
if (!server.wl_display) {