diff options
| author | Simon Ser <contact@emersion.fr> | 2019-07-27 23:02:56 +0300 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-07-27 17:16:56 -0400 |
| commit | f984f21b6a71bf8794de61f58b00d99ed3537c50 (patch) | |
| tree | 4f20eeb79a06469be2e5a6f62751e7aa4add4676 /sway/desktop | |
| parent | e4bba906b68b9347c085a7833f6dbc7ddb1a41b4 (diff) | |
| download | sway-f984f21b6a71bf8794de61f58b00d99ed3537c50.tar.xz | |
Remove all wayland-server.h includes
The documentation for wayland-server.h says:
> Use of this header file is discouraged. Prefer including
> wayland-server-core.h instead, which does not include the server protocol
> header and as such only defines the library PI, excluding the deprecated API
> below.
Replacing wayland-server.h with wayland-server-core.h allows us to drop the
WL_HIDE_DEPRECATED declaration.
This commit si similar to wlroots' ca45f4490ccc ("Remove all wayland-server.h
includes").
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/layer_shell.c | 2 | ||||
| -rw-r--r-- | sway/desktop/output.c | 2 | ||||
| -rw-r--r-- | sway/desktop/render.c | 2 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell.c | 2 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 2 | ||||
| -rw-r--r-- | sway/desktop/xwayland.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 1667995c..ed00b282 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -1,7 +1,7 @@ #include <stdbool.h> #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_layer_shell_v1.h> #include <wlr/types/wlr_output_damage.h> diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 22ced14e..7dcc8e51 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <strings.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_buffer.h> diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 6bea5656..9d7b89af 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <strings.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_buffer.h> diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 9e914f14..01574577 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -2,7 +2,7 @@ #include <float.h> #include <stdbool.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_xdg_shell.h> #include <wlr/util/edges.h> #include "log.h" diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 5ac589cf..0c6ab7dc 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -2,7 +2,7 @@ #include <float.h> #include <stdbool.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_xdg_shell_v6.h> #include "log.h" #include "sway/decoration.h" diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index f6ca8f81..0f708201 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -1,7 +1,7 @@ #define _POSIX_C_SOURCE 199309L #include <stdbool.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output.h> #include <wlr/xwayland.h> |