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.
---
 examples/fullscreen-shell.c | 2 +-
 examples/multi-pointer.c    | 3 +--
 examples/output-layout.c    | 3 +--
 examples/pointer.c          | 3 +--
 examples/rotation.c         | 3 +--
 examples/simple.c           | 2 +-
 examples/tablet.c           | 3 +--
 examples/touch.c            | 3 +--
 8 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'examples')

diff --git a/examples/fullscreen-shell.c b/examples/fullscreen-shell.c
index e9e64ce1..dbea9f04 100644
--- a/examples/fullscreen-shell.c
+++ b/examples/fullscreen-shell.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c
index 44cf26d5..691bc49d 100644
--- a/examples/multi-pointer.c
+++ b/examples/multi-pointer.c
@@ -7,8 +7,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/gles2.h>
diff --git a/examples/output-layout.c b/examples/output-layout.c
index 5e406af0..d18a83af 100644
--- a/examples/output-layout.c
+++ b/examples/output-layout.c
@@ -8,8 +8,7 @@
 #include <strings.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/wlr_renderer.h>
diff --git a/examples/pointer.c b/examples/pointer.c
index cf4b122d..4b0e6f46 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -6,8 +6,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/gles2.h>
diff --git a/examples/rotation.c b/examples/rotation.c
index cfcd001b..6e10721d 100644
--- a/examples/rotation.c
+++ b/examples/rotation.c
@@ -8,8 +8,7 @@
 #include <strings.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/wlr_renderer.h>
diff --git a/examples/simple.c b/examples/simple.c
index 27eb6c20..96f33610 100644
--- a/examples/simple.c
+++ b/examples/simple.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>
diff --git a/examples/tablet.c b/examples/tablet.c
index 6df28586..d437ff17 100644
--- a/examples/tablet.c
+++ b/examples/tablet.c
@@ -6,8 +6,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/wlr_renderer.h>
diff --git a/examples/touch.c b/examples/touch.c
index 4ca9b993..c306ba69 100644
--- a/examples/touch.c
+++ b/examples/touch.c
@@ -7,8 +7,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>
-- 
cgit v1.2.3