From ca45f4490ccce64bf7aa0985951319646b55d258 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Sat, 27 Jul 2019 11:53:54 +0300
Subject: 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.
---
 rootston/input.c        | 2 +-
 rootston/keyboard.c     | 2 +-
 rootston/layer_shell.c  | 2 +-
 rootston/main.c         | 2 +-
 rootston/seat.c         | 2 +-
 rootston/xdg_shell.c    | 2 +-
 rootston/xdg_shell_v6.c | 2 +-
 rootston/xwayland.c     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'rootston')

diff --git a/rootston/input.c b/rootston/input.c
index 757f1b35..d5e04d3d 100644
--- a/rootston/input.c
+++ b/rootston/input.c
@@ -2,7 +2,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/libinput.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_cursor.h>
diff --git a/rootston/keyboard.c b/rootston/keyboard.c
index 9d3fadf6..da88e914 100644
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
diff --git a/rootston/layer_shell.c b/rootston/layer_shell.c
index 1a533755..278046a3 100644
--- a/rootston/layer_shell.c
+++ b/rootston/layer_shell.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
diff --git a/rootston/main.c b/rootston/main.c
index b14989fa..350906e3 100644
--- a/rootston/main.c
+++ b/rootston/main.c
@@ -2,7 +2,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
diff --git a/rootston/seat.c b/rootston/seat.c
index 719fc352..c51d6ee5 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/libinput.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_data_device.h>
diff --git a/rootston/xdg_shell.c b/rootston/xdg_shell.c
index 7b12ec70..7b565392 100644
--- a/rootston/xdg_shell.c
+++ b/rootston/xdg_shell.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell.h>
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 917ca3a0..5830d344 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 89d0e497..7dc637ce 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
-- 
cgit v1.2.3