From 536114dd4608bf67e6911e8a22749d7b36c5e6dc Mon Sep 17 00:00:00 2001
From: "Eduardo Lima (Etrunko)" <eduardo.lima@intel.com>
Date: Wed, 3 Oct 2012 16:30:28 +0000
Subject: [PATCH] Ecore_Evas: Fix Wayland engine includes

Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>



SVN revision: 77373
---
 legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h     | 6 ++++--
 legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c | 2 +-
 legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
index 6d45999bd5..37d34aa529 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
@@ -79,13 +79,15 @@
 # include <Evas_Engine_Gl_Cocoa.h>
 #endif
 
-#ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
+#if defined(BUILD_ECORE_EVAS_WAYLAND_SHM) || defined(BUILD_ECORE_EVAS_WAYLAND_EGL)
 # include "Ecore_Wayland.h"
+#endif
+
+#ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
 # include <Evas_Engine_Wayland_Shm.h>
 #endif
 
 #ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
-# include "Ecore_Wayland.h"
 # include <Evas_Engine_Wayland_Egl.h>
 #endif
 
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
index f881a4604b..2d9952457b 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
@@ -24,10 +24,10 @@
 #include <Evas.h>
 #include <Ecore.h>
 
-#include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 
 #ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
+# include "ecore_evas_private.h"
 # include <Evas_Engine_Wayland_Egl.h>
 # include <Ecore_Wayland.h>
 
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
index 58a417b18a..51a9c0a34d 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
@@ -24,10 +24,10 @@
 #include <Evas.h>
 #include <Ecore.h>
 
-#include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 
 #ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
+# include "ecore_evas_private.h"
 # include <Evas_Engine_Wayland_Shm.h>
 # include <Ecore_Wayland.h>