jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=44cff879a1758736130aa69d52ed0b617c4cab7e
commit 44cff879a1758736130aa69d52ed0b617c4cab7e
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Wed Aug 24 14:12:47 2016 +0900
evas: Fix includes when enabling BETA but not EO API
This fixes the build for older versions of E.
---
src/lib/evas/Evas_Common.h | 2 +-
src/lib/evas/Evas_Eo.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 40a92a4..00c17d2 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -89,7 +89,7 @@ EAPI extern Evas_Version * evas_version;
* @since 1.1
*/
// Support not having eo available
-#ifdef EFL_BETA_API_SUPPORT
+#if defined (EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
typedef Efl_Callback_Priority Evas_Callback_Priority;
#else
typedef short Evas_Callback_Priority;
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index cd9e217..7cd4c68 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -65,7 +65,7 @@
#include "canvas/efl_canvas_object.eo.h"
#endif /* EFL_EO_API_SUPPORT */
-#ifdef EFL_BETA_API_SUPPORT
+#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
/**
* @defgroup Evas_3D Evas 3D Extensions
*
@@ -281,7 +281,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
#include "canvas/efl_gfx_map.eo.h"
#endif /* EFL_EO_API_SUPPORT */
-#ifdef EFL_BETA_API_SUPPORT
+#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
/**
* @ingroup Evas_Object_VG
*
--
