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.
---
 include/wlr/backend/drm.h      | 2 +-
 include/wlr/backend/libinput.h | 2 +-
 include/wlr/backend/session.h  | 2 +-
 include/wlr/backend/wayland.h  | 2 +-
 include/wlr/backend/x11.h      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include/wlr/backend')

diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h
index 3724adfb..e4b5e2d1 100644
--- a/include/wlr/backend/drm.h
+++ b/include/wlr/backend/drm.h
@@ -9,7 +9,7 @@
 #ifndef WLR_BACKEND_DRM_H
 #define WLR_BACKEND_DRM_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/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h
index 1a2ab294..50faaf7d 100644
--- a/include/wlr/backend/libinput.h
+++ b/include/wlr/backend/libinput.h
@@ -10,7 +10,7 @@
 #define WLR_BACKEND_LIBINPUT_H
 
 #include <libinput.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h
index 7b26f34c..36b80a8d 100644
--- a/include/wlr/backend/session.h
+++ b/include/wlr/backend/session.h
@@ -4,7 +4,7 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <sys/types.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 struct session_impl;
 
diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h
index 9a47d1ce..cd8e73fb 100644
--- a/include/wlr/backend/wayland.h
+++ b/include/wlr/backend/wayland.h
@@ -2,7 +2,7 @@
 #define WLR_BACKEND_WAYLAND_H
 #include <stdbool.h>
 #include <wayland-client.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_output.h>
diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h
index 9be976b2..5a6f050b 100644
--- a/include/wlr/backend/x11.h
+++ b/include/wlr/backend/x11.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 #include <wlr/backend.h>
 #include <wlr/types/wlr_input_device.h>
-- 
cgit v1.2.3