[PATCH weston 1/2] Don't prepend protocol/ to include paths

Daniel Stone daniels at collabora.com
Thu Nov 24 15:32:40 UTC 2016


No need to add protocol/, as it's already handled by an explicit
compiler include path.

Signed-off-by: Daniel Stone <daniels at collabora.com>
---
 libweston-desktop/xdg-shell-v5.c | 2 +-
 libweston-desktop/xdg-shell-v6.c | 2 +-
 libweston/input.c                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c
index 9fd3a87..08cf71e 100644
--- a/libweston-desktop/xdg-shell-v5.c
+++ b/libweston-desktop/xdg-shell-v5.c
@@ -32,7 +32,7 @@
 
 #include "compositor.h"
 #include "zalloc.h"
-#include "protocol/xdg-shell-unstable-v5-server-protocol.h"
+#include "xdg-shell-unstable-v5-server-protocol.h"
 
 #include "libweston-desktop.h"
 #include "internal.h"
diff --git a/libweston-desktop/xdg-shell-v6.c b/libweston-desktop/xdg-shell-v6.c
index edd1dc4..7d0bd8e 100644
--- a/libweston-desktop/xdg-shell-v6.c
+++ b/libweston-desktop/xdg-shell-v6.c
@@ -33,7 +33,7 @@
 
 #include "compositor.h"
 #include "zalloc.h"
-#include "protocol/xdg-shell-unstable-v6-server-protocol.h"
+#include "xdg-shell-unstable-v6-server-protocol.h"
 
 #include "libweston-desktop.h"
 #include "internal.h"
diff --git a/libweston/input.c b/libweston/input.c
index 471c65e..4fedc55 100644
--- a/libweston/input.c
+++ b/libweston/input.c
@@ -39,8 +39,8 @@
 #include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "compositor.h"
-#include "protocol/relative-pointer-unstable-v1-server-protocol.h"
-#include "protocol/pointer-constraints-unstable-v1-server-protocol.h"
+#include "relative-pointer-unstable-v1-server-protocol.h"
+#include "pointer-constraints-unstable-v1-server-protocol.h"
 
 enum pointer_constraint_type {
 	POINTER_CONSTRAINT_TYPE_LOCK,
-- 
2.9.3



More information about the wayland-devel mailing list