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 /include | |
| 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 'include')
| -rw-r--r-- | include/rootston/desktop.h | 3 | ||||
| -rw-r--r-- | include/rootston/server.h | 3 | ||||
| -rw-r--r-- | include/rootston/view.h | 5 | ||||
| -rw-r--r-- | include/wlr/xwayland.h | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 289875c5..7039cfcf 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -2,6 +2,7 @@ #define _ROOTSTON_DESKTOP_H #include <time.h> #include <wayland-server.h> +#include "config.h" #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_compositor.h> @@ -50,7 +51,7 @@ struct roots_desktop { struct wl_listener wl_shell_surface; struct wl_listener decoration_new; -#ifdef HAS_XWAYLAND +#ifdef WLR_HAS_XWAYLAND struct wlr_xwayland *xwayland; struct wl_listener xwayland_surface; struct wl_listener xwayland_ready; diff --git a/include/rootston/server.h b/include/rootston/server.h index 8fc6530e..a014c749 100644 --- a/include/rootston/server.h +++ b/include/rootston/server.h @@ -1,11 +1,12 @@ #ifndef _ROOTSTON_SERVER_H #define _ROOTSTON_SERVER_H #include <wayland-server.h> +#include "config.h" #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/types/wlr_data_device.h> #include <wlr/render.h> -#ifdef HAS_XWAYLAND +#ifdef WLR_HAS_XWAYLAND #include <wlr/xwayland.h> #endif #include "rootston/config.h" diff --git a/include/rootston/view.h b/include/rootston/view.h index bb7297d0..53e96764 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -2,6 +2,7 @@ #define _ROOTSTON_VIEW_H #include <stdbool.h> +#include "config.h" #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_xdg_shell_v6.h> @@ -79,14 +80,14 @@ struct roots_view { union { struct wlr_wl_shell_surface *wl_shell_surface; struct wlr_xdg_surface_v6 *xdg_surface_v6; -#ifdef HAS_XWAYLAND +#ifdef WLR_HAS_XWAYLAND struct wlr_xwayland_surface *xwayland_surface; #endif }; union { struct roots_wl_shell_surface *roots_wl_shell_surface; struct roots_xdg_surface_v6 *roots_xdg_surface_v6; -#ifdef HAS_XWAYLAND +#ifdef WLR_HAS_XWAYLAND struct roots_xwayland_surface *roots_xwayland_surface; #endif }; diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index acf04595..230cfeed 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -3,11 +3,12 @@ #include <time.h> #include <stdbool.h> +#include "config.h" #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_seat.h> #include <xcb/xcb.h> -#ifdef HAS_XCB_ICCCM +#ifdef WLR_HAS_XCB_ICCCM #include <xcb/xcb_icccm.h> #endif |