commit 7dbb0e148f26e886197a1d8d1b6047531bcc2fbe
author Daniel Stone <daniels@collabora.com> Thu Nov 24 15:30:41 2016 +0000
committer Daniel Stone <daniels@collabora.com> Tue Nov 29 09:49:00 2016 +0000
tree 7403b4b411faf1842c1040407a5a97f92d053802
parent 411ffabbb56bc5075dc3c70a9e716e4142b48419

Don't prepend protocol/ to include paths

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

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Dima Ryazanov <dima@gmail.com>

clients/simple-egl.c

diff --git a/clients/simple-egl.c b/clients/simple-egl.c
index ca88472..9b6fa1f 100644
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -45,7 +45,7 @@
 #include "xdg-shell-unstable-v6-client-protocol.h"
 #include <sys/types.h>
 #include <unistd.h>
-#include "protocol/ivi-application-client-protocol.h"
+#include "ivi-application-client-protocol.h"
 #define IVI_SURFACE_ID 9000
 
 #include "shared/helpers.h"

libweston-desktop/xdg-shell-v5.c

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"

libweston-desktop/xdg-shell-v6.c

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"

libweston/input.c

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,