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.
---
 backend/backend.c                | 2 +-
 backend/drm/backend.c            | 2 +-
 backend/drm/drm.c                | 2 +-
 backend/rdp/keyboard.c           | 2 +-
 backend/rdp/output.c             | 2 +-
 backend/rdp/pointer.c            | 2 +-
 backend/session/direct-freebsd.c | 2 +-
 backend/session/direct.c         | 2 +-
 backend/session/logind.c         | 2 +-
 backend/session/noop.c           | 2 +-
 backend/session/session.c        | 2 +-
 backend/wayland/backend.c        | 2 +-
 backend/x11/backend.c            | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'backend')

diff --git a/backend/backend.c b/backend/backend.c
index 2c76d989..542d6f80 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/interface.h>
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 7fdab816..541e720f 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_output.h>
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index db727010..eef7beb5 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <strings.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wayland-util.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
diff --git a/backend/rdp/keyboard.c b/backend/rdp/keyboard.c
index b3c5869d..78dd8b08 100644
--- a/backend/rdp/keyboard.c
+++ b/backend/rdp/keyboard.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_keyboard.h>
diff --git a/backend/rdp/output.c b/backend/rdp/output.c
index 6133b751..45eba3aa 100644
--- a/backend/rdp/output.c
+++ b/backend/rdp/output.c
@@ -2,7 +2,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
diff --git a/backend/rdp/pointer.c b/backend/rdp/pointer.c
index 31186669..b3fdcd73 100644
--- a/backend/rdp/pointer.c
+++ b/backend/rdp/pointer.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_pointer.h>
 #include <wlr/interfaces/wlr_pointer.h>
diff --git a/backend/session/direct-freebsd.c b/backend/session/direct-freebsd.c
index 391cc3fd..238664ac 100644
--- a/backend/session/direct-freebsd.c
+++ b/backend/session/direct-freebsd.c
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <termios.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
diff --git a/backend/session/direct.c b/backend/session/direct.c
index c634575a..4ffd711d 100644
--- a/backend/session/direct.c
+++ b/backend/session/direct.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
 #include "backend/session/direct-ipc.h"
diff --git a/backend/session/logind.c b/backend/session/logind.c
index c7fb24c0..066003d9 100644
--- a/backend/session/logind.c
+++ b/backend/session/logind.c
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/config.h>
 #include <wlr/util/log.h>
diff --git a/backend/session/noop.c b/backend/session/noop.c
index 87ec1207..0e13a177 100644
--- a/backend/session/noop.c
+++ b/backend/session/noop.c
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
 #include "util/signal.h"
diff --git a/backend/session/session.c b/backend/session/session.c
index 90fcfed6..70b4a567 100644
--- a/backend/session/session.c
+++ b/backend/session/session.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/config.h>
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 25feb6fb..c2762c4a 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -5,7 +5,7 @@
 
 #include <wlr/config.h>
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_input_device.h>
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 6bece36d..26c56cab 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -10,7 +10,7 @@
 #include <wlr/config.h>
 
 #include <X11/Xlib-xcb.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <xcb/xcb.h>
 #include <xcb/xfixes.h>
 #include <xcb/xinput.h>
-- 
cgit v1.2.3