From 7dbb0e148f26e886197a1d8d1b6047531bcc2fbe Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 24 Nov 2016 15:30:41 +0000 Subject: [PATCH] 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 Reviewed-by: Dima Ryazanov --- clients/simple-egl.c | 2 +- libweston-desktop/xdg-shell-v5.c | 2 +- libweston-desktop/xdg-shell-v6.c | 2 +- libweston/input.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/simple-egl.c b/clients/simple-egl.c index ca884723..9b6fa1f2 100644 --- a/clients/simple-egl.c +++ b/clients/simple-egl.c @@ -45,7 +45,7 @@ #include "xdg-shell-unstable-v6-client-protocol.h" #include #include -#include "protocol/ivi-application-client-protocol.h" +#include "ivi-application-client-protocol.h" #define IVI_SURFACE_ID 9000 #include "shared/helpers.h" diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c index 9fd3a872..08cf71ee 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 edd1dc4a..7d0bd8e4 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 471c65ec..4fedc558 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.34.1