tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bf772125e8c2d623fe8cea841415cd544e2f8f58
commit bf772125e8c2d623fe8cea841415cd544e2f8f58 Author: Tom Hacohen <[email protected]> Date: Tue Aug 2 16:14:12 2016 +0100 Eo: Move Eo back into beta. Eo should now be considered beta again. This commit puts it back in beta and makes it necessary to define EFL_BETA_API_SUPPORT before including Eo.h. --- src/lib/ecore/Ecore_Common.h | 3 +++ src/lib/eo/Eo.h | 7 +++++++ src/lib/evas/Evas_Common.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h index c4d68dc..4c96d17 100644 --- a/src/lib/ecore/Ecore_Common.h +++ b/src/lib/ecore/Ecore_Common.h @@ -959,7 +959,10 @@ enum _Ecore_Exe_Win32_Priority }; typedef enum _Ecore_Exe_Win32_Priority Ecore_Exe_Win32_Priority; +#ifdef EFL_BETA_API_SUPPORT #include "ecore_exe.eo.h" +#endif +#include "ecore_exe.eo.legacy.h" #define _ECORE_EXE_EO_CLASS_TYPE diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index f72ee69..b3b4df6 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -119,6 +119,11 @@ typedef struct _Eo_Opaque Eo; typedef Eo Eo_Class; #define _EO_CLASS_EO_CLASS_TYPE +typedef Eo Eo_Base; +#define _EO_BASE_EO_CLASS_TYPE + +#ifdef EFL_BETA_API_SUPPORT + /** * @var _eo_class_creation_lock * This variable is used for locking purposes in the class_get function @@ -1138,6 +1143,8 @@ EAPI const Eo_Event_Description *eo_base_legacy_only_event_description_get(const EAPI int ___eo_ref2_get(const Eo *obj_id); EAPI void ___eo_ref2_reset(const Eo *obj_id); +#endif + #ifdef __cplusplus } #endif diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index b87f65b..8efee9c 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -88,7 +88,12 @@ EAPI extern Evas_Version * evas_version; * * @since 1.1 */ +// Support not having eo available +#ifdef EFL_BETA_API_SUPPORT typedef Eo_Callback_Priority Evas_Callback_Priority; +#else +typedef short Evas_Callback_Priority; +#endif typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; /**< A generic rectangle handle */ typedef struct _Evas_Point Evas_Point; /**< integer point */ --
