diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-11-12 16:14:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 16:14:18 -0500 |
| commit | 77dfac4fa4082ce95fc9769861e0b971754b6a66 (patch) | |
| tree | cfffb364f9e79dc7acb2dc67075b33f15a1f57c9 /include/wlr | |
| parent | d2d8372cdc20c908342497fcdbfa91b6fc99df82 (diff) | |
| parent | 51bfdd620e70c41e1a9fb4ce7831eddfb1bf893b (diff) | |
Merge pull request #1372 from emersion/config10
Use #if instead of #ifdef for wlroots config data
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/backend/meson.build | 2 | ||||
| -rw-r--r-- | include/wlr/meson.build | 2 | ||||
| -rw-r--r-- | include/wlr/render/egl.h | 2 | ||||
| -rw-r--r-- | include/wlr/render/interface.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/wlr/backend/meson.build b/include/wlr/backend/meson.build index e005b854..3d6f0e40 100644 --- a/include/wlr/backend/meson.build +++ b/include/wlr/backend/meson.build @@ -9,7 +9,7 @@ install_headers( subdir: 'wlr/backend', ) -if conf_data.get('WLR_HAS_X11_BACKEND', false) +if conf_data.get('WLR_HAS_X11_BACKEND', 0) == 1 install_headers('x11.h', subdir: 'wlr/backend') endif diff --git a/include/wlr/meson.build b/include/wlr/meson.build index 43b5aec9..8874dbc7 100644 --- a/include/wlr/meson.build +++ b/include/wlr/meson.build @@ -15,7 +15,7 @@ install_headers( 'xcursor.h', subdir: 'wlr' ) -if conf_data.get('WLR_HAS_XWAYLAND', false) +if conf_data.get('WLR_HAS_XWAYLAND', 0) == 1 install_headers('xwayland.h', subdir: 'wlr') endif diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h index 9ba2996a..fedb6fdd 100644 --- a/include/wlr/render/egl.h +++ b/include/wlr/render/egl.h @@ -11,7 +11,7 @@ #include <wlr/config.h> -#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND)) +#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND #define MESA_EGL_NO_X11_HEADERS #endif diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 9500bced..a7f97a89 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -11,7 +11,7 @@ #include <wlr/config.h> -#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND)) +#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND #define MESA_EGL_NO_X11_HEADERS #endif |