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").
This commit is contained in:
Simon Ser 2019-07-27 23:02:56 +03:00 committed by Drew DeVault
parent e4bba906b6
commit f984f21b6a
14 changed files with 13 additions and 14 deletions

View File

@ -2,7 +2,7 @@
#define _SWAY_OUTPUT_H #define _SWAY_OUTPUT_H
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_box.h> #include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include "config.h" #include "config.h"

View File

@ -1,7 +1,7 @@
#ifndef _SWAY_SERVER_H #ifndef _SWAY_SERVER_H
#define _SWAY_SERVER_H #define _SWAY_SERVER_H
#include <stdbool.h> #include <stdbool.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>

View File

@ -1,6 +1,6 @@
#ifndef _SWAY_VIEW_H #ifndef _SWAY_VIEW_H
#define _SWAY_VIEW_H #define _SWAY_VIEW_H
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_xdg_shell_v6.h> #include <wlr/types/wlr_xdg_shell_v6.h>
#include "config.h" #include "config.h"

View File

@ -13,7 +13,6 @@ project(
add_project_arguments( add_project_arguments(
[ [
'-DWL_HIDE_DEPRECATED',
'-DWLR_USE_UNSTABLE', '-DWLR_USE_UNSTABLE',
'-Wno-unused-parameter', '-Wno-unused-parameter',

View File

@ -1,7 +1,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_box.h> #include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_layer_shell_v1.h> #include <wlr/types/wlr_layer_shell_v1.h>
#include <wlr/types/wlr_output_damage.h> #include <wlr/types/wlr_output_damage.h>

View File

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <strings.h>
#include <time.h> #include <time.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_box.h> #include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_buffer.h>

View File

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <strings.h>
#include <time.h> #include <time.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_box.h> #include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_buffer.h>

View File

@ -2,7 +2,7 @@
#include <float.h> #include <float.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_xdg_shell.h> #include <wlr/types/wlr_xdg_shell.h>
#include <wlr/util/edges.h> #include <wlr/util/edges.h>
#include "log.h" #include "log.h"

View File

@ -2,7 +2,7 @@
#include <float.h> #include <float.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_xdg_shell_v6.h> #include <wlr/types/wlr_xdg_shell_v6.h>
#include "log.h" #include "log.h"
#include "sway/decoration.h" #include "sway/decoration.h"

View File

@ -1,7 +1,7 @@
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 199309L
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.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_layout.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/xwayland.h> #include <wlr/xwayland.h>

View File

@ -14,7 +14,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/desktop/transaction.h" #include "sway/desktop/transaction.h"

View File

@ -2,7 +2,7 @@
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/noop.h> #include <wlr/backend/noop.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>

View File

@ -4,7 +4,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_xdg_shell_v6.h> #include <wlr/types/wlr_xdg_shell_v6.h>
#include <wlr/types/wlr_xdg_shell.h> #include <wlr/types/wlr_xdg_shell.h>

View File

@ -1,7 +1,7 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <strings.h>
#include <wayland-server.h> #include <wayland-server-core.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_buffer.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>