diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-12-27 04:30:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 04:30:05 -0500 |
| commit | 47f9f91d157c9f650afe1172b3bb2d52def66a10 (patch) | |
| tree | 27d6bd1104a3d3795905adfcd9e442aa28c4bf9c /rootston | |
| parent | 4d744aeb230f36d990c102a89314f95ff802ca75 (diff) | |
| parent | 57a09c8ca45e0ec023b7be88745b21fc71649c52 (diff) | |
Merge pull request #523 from besser82/bugfix/config_header
config: Put all defines into config.h
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/config.c | 1 | ||||
| -rw-r--r-- | rootston/desktop.c | 3 | ||||
| -rw-r--r-- | rootston/main.c | 3 | ||||
| -rw-r--r-- | rootston/seat.c | 1 | ||||
| -rw-r--r-- | rootston/xwayland.c | 3 |
5 files changed, 8 insertions, 3 deletions
diff --git a/rootston/config.c b/rootston/config.c index dd741186..f369c4f5 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -9,6 +9,7 @@ #include <strings.h> #include <unistd.h> #include <sys/param.h> +#include "config.h" #include <wlr/util/log.h> #include <wlr/types/wlr_box.h> #include "rootston/config.h" diff --git a/rootston/desktop.c b/rootston/desktop.c index 1431dc5d..a4692439 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -3,6 +3,7 @@ #include <time.h> #include <stdlib.h> #include <math.h> +#include "config.h" #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_cursor.h> @@ -440,7 +441,7 @@ struct roots_desktop *desktop_create(struct roots_server *server, &desktop->wl_shell_surface); desktop->wl_shell_surface.notify = handle_wl_shell_surface; -#ifdef HAS_XWAYLAND +#ifdef WLR_HAS_XWAYLAND if (config->xwayland) { desktop->xwayland = wlr_xwayland_create(server->wl_display, desktop->compositor); diff --git a/rootston/main.c b/rootston/main.c index 161824d6..87f1c0b4 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <unistd.h> #include <wayland-server.h> +#include "config.h" #include <wlr/backend.h> #include <wlr/backend/headless.h> #include <wlr/backend/multi.h> @@ -64,7 +65,7 @@ int main(int argc, char **argv) { } setenv("WAYLAND_DISPLAY", socket, true); -#ifndef HAS_XWAYLAND +#ifndef WLR_HAS_XWAYLAND ready(NULL, NULL); #else if (server.desktop->xwayland != NULL) { diff --git a/rootston/seat.c b/rootston/seat.c index ce0f1374..635bc8b1 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -2,6 +2,7 @@ #include <stdlib.h> #include <string.h> #include <wayland-server.h> +#include "config.h" #include <wlr/types/wlr_xcursor_manager.h> #include <wlr/util/log.h> #include "rootston/xcursor.h" diff --git a/rootston/xwayland.c b/rootston/xwayland.c index 5f677116..b00b61bc 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -2,11 +2,12 @@ #include <stdlib.h> #include <stdbool.h> #include <wayland-server.h> +#include "config.h" #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_surface.h> #include <wlr/xwayland.h> #include <wlr/util/log.h> -#include "rootston/desktop.h" +#include "rootston/server.h" #include "rootston/server.h" static void activate(struct roots_view *view, bool active) { |