From f984f21b6a71bf8794de61f58b00d99ed3537c50 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Sat, 27 Jul 2019 23:02:56 +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.

This commit si similar to wlroots' ca45f4490ccc ("Remove all wayland-server.h
includes").
---
 include/sway/output.h    | 2 +-
 include/sway/server.h    | 2 +-
 include/sway/tree/view.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/output.h b/include/sway/output.h
index a5a2f29e..b94824b4 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -2,7 +2,7 @@
 #define _SWAY_OUTPUT_H
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include "config.h"
diff --git a/include/sway/server.h b/include/sway/server.h
index 21661685..7cbca4f2 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_SERVER_H
 #define _SWAY_SERVER_H
 #include <stdbool.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/include/sway/tree/view.h b/include/sway/tree/view.h
index 4ce487fc..d9f5b8f2 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,6 +1,6 @@
 #ifndef _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_xdg_shell_v6.h>
 #include "config.h"
-- 
cgit v1.2.3