commit 4678bab13ce29b02363abfa40fd78cf94e107e8b
author Jon Cruz <jonc@osg.samsung.com> Mon Jun 15 15:37:07 2015 -0700
committer Bryce Harrington <bryce@osg.samsung.com> Mon Jun 15 17:11:09 2015 -0700
tree e7a488c5d6daf970365771eba18c551363dad3b6
parent b7e07846bdbdfd57111cdf119e716ecf8b387f3c

Remove redundant #include path component.

Using the parent '../' path component in #include statements makes
the codebase more rigid and is redundant due to proper -I use.

Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>

src/compositor-wayland.c

diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 7cf61c9..4610552 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -42,9 +42,9 @@
 #include "compositor.h"
 #include "gl-renderer.h"
 #include "pixman-renderer.h"
-#include "../shared/image-loader.h"
-#include "../shared/os-compatibility.h"
-#include "../shared/cairo-util.h"
+#include "shared/image-loader.h"
+#include "shared/os-compatibility.h"
+#include "shared/cairo-util.h"
 #include "fullscreen-shell-client-protocol.h"
 #include "presentation_timing-server-protocol.h"
 

src/compositor-x11.c

diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 1446517..c5dcfb9 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -52,8 +52,8 @@
 #include "compositor.h"
 #include "gl-renderer.h"
 #include "pixman-renderer.h"
-#include "../shared/config-parser.h"
-#include "../shared/image-loader.h"
+#include "shared/config-parser.h"
+#include "shared/image-loader.h"
 #include "presentation_timing-server-protocol.h"
 
 #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10)

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 1d61dde..2f7864f 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -61,7 +61,7 @@
 #include "compositor.h"
 #include "scaler-server-protocol.h"
 #include "presentation_timing-server-protocol.h"
-#include "../shared/os-compatibility.h"
+#include "shared/os-compatibility.h"
 #include "git-version.h"
 #include "version.h"
 

src/input.c

diff --git a/src/input.c b/src/input.c
index e2d33d6..65d2d09 100644
--- a/src/input.c
+++ b/src/input.c
@@ -34,7 +34,7 @@
 #include <fcntl.h>
 #include <limits.h>
 
-#include "../shared/os-compatibility.h"
+#include "shared/os-compatibility.h"
 #include "compositor.h"
 
 static void

src/screen-share.c

diff --git a/src/screen-share.c b/src/screen-share.c
index 1a9a599..92c4e02 100644
--- a/src/screen-share.c
+++ b/src/screen-share.c
@@ -40,7 +40,7 @@
 #include <wayland-client.h>
 
 #include "compositor.h"
-#include "../shared/os-compatibility.h"
+#include "shared/os-compatibility.h"
 #include "fullscreen-shell-client-protocol.h"
 
 struct shared_output {

src/screenshooter.c

diff --git a/src/screenshooter.c b/src/screenshooter.c
index e099a37..ecf2fdd 100644
--- a/src/screenshooter.c
+++ b/src/screenshooter.c
@@ -36,7 +36,7 @@
 #include "compositor.h"
 #include "screenshooter-server-protocol.h"
 
-#include "../wcap/wcap-decode.h"
+#include "wcap/wcap-decode.h"
 
 struct screenshooter {
 	struct weston_compositor *ec;