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 /include | |
parent | Avoid adding duplicate criteria for no_focus and command (diff) | |
download | sway-f984f21b6a71bf8794de61f58b00d99ed3537c50.tar.gz sway-f984f21b6a71bf8794de61f58b00d99ed3537c50.tar.zst sway-f984f21b6a71bf8794de61f58b00d99ed3537c50.zip |
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 'include')
-rw-r--r-- | include/sway/output.h | 2 | ||||
-rw-r--r-- | include/sway/server.h | 2 | ||||
-rw-r--r-- | include/sway/tree/view.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index a5a2f29e..b94824b4 100644 --- a/include/sway/output.h +++ b/include/sway/output.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define _SWAY_OUTPUT_H | 2 | #define _SWAY_OUTPUT_H |
3 | #include <time.h> | 3 | #include <time.h> |
4 | #include <unistd.h> | 4 | #include <unistd.h> |
5 | #include <wayland-server.h> | 5 | #include <wayland-server-core.h> |
6 | #include <wlr/types/wlr_box.h> | 6 | #include <wlr/types/wlr_box.h> |
7 | #include <wlr/types/wlr_output.h> | 7 | #include <wlr/types/wlr_output.h> |
8 | #include "config.h" | 8 | #include "config.h" |
diff --git a/include/sway/server.h b/include/sway/server.h index 21661685..7cbca4f2 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _SWAY_SERVER_H | 1 | #ifndef _SWAY_SERVER_H |
2 | #define _SWAY_SERVER_H | 2 | #define _SWAY_SERVER_H |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <wayland-server.h> | 4 | #include <wayland-server-core.h> |
5 | #include <wlr/backend.h> | 5 | #include <wlr/backend.h> |
6 | #include <wlr/backend/session.h> | 6 | #include <wlr/backend/session.h> |
7 | #include <wlr/render/wlr_renderer.h> | 7 | #include <wlr/render/wlr_renderer.h> |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 4ce487fc..d9f5b8f2 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef _SWAY_VIEW_H | 1 | #ifndef _SWAY_VIEW_H |
2 | #define _SWAY_VIEW_H | 2 | #define _SWAY_VIEW_H |
3 | #include <wayland-server.h> | 3 | #include <wayland-server-core.h> |
4 | #include <wlr/types/wlr_surface.h> | 4 | #include <wlr/types/wlr_surface.h> |
5 | #include <wlr/types/wlr_xdg_shell_v6.h> | 5 | #include <wlr/types/wlr_xdg_shell_v6.h> |
6 | #include "config.h" | 6 | #include "config.h" |