commit 3c17933de868e872dc9eb2fab80c95b396b1fee5
author Kristian Høgsberg <krh@bitplanet.net> Tue Aug 06 19:27:04 2013 -0700
committer Kristian Høgsberg <krh@bitplanet.net> Tue Aug 06 19:27:04 2013 -0700
tree bd2694b72a4832c59fc11da9c01328e2bf4e4523
parent 85c40f2d85ca73409bfadab606de5e745f25ef40

Use #define WL_HIDE_DEPRECATED to avoid deprecated warnings for wl_buffer

clients/nested.c

diff --git a/clients/nested.c b/clients/nested.c
index a4e07f7..dfeeb96 100644
--- a/clients/nested.c
+++ b/clients/nested.c
@@ -40,6 +40,7 @@
 #include <cairo-gl.h>
 
 #include <wayland-client.h>
+#define WL_HIDE_DEPRECATED
 #include <wayland-server.h>
 
 #include "window.h"

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index e94b495..19d84af 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -52,7 +52,6 @@
 #include <libunwind.h>
 #endif
 
-#include <wayland-server.h>
 #include "compositor.h"
 #include "subsurface-server-protocol.h"
 #include "../shared/os-compatibility.h"

src/compositor.h

diff --git a/src/compositor.h b/src/compositor.h
index 57b206e..7fbc4b3 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -30,6 +30,8 @@
 
 #include <pixman.h>
 #include <xkbcommon/xkbcommon.h>
+
+#define WL_HIDE_DEPRECATED
 #include <wayland-server.h>
 
 #include "version.h"

src/log.c

diff --git a/src/log.c b/src/log.c
index fa55f94..911b0c6 100644
--- a/src/log.c
+++ b/src/log.c
@@ -29,7 +29,6 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include <wayland-server.h>
 #include <wayland-util.h>
 
 #include "compositor.h"

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index bcde789..30b55c3 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -34,7 +34,6 @@
 #include <math.h>
 #include <sys/types.h>
 
-#include <wayland-server.h>
 #include "compositor.h"
 #include "desktop-shell-server-protocol.h"
 #include "input-method-server-protocol.h"