summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-02 16:14:12 +0100
committerTom Hacohen <tom@stosb.com>2016-08-02 16:34:35 +0100
commitbf772125e8c2d623fe8cea841415cd544e2f8f58 (patch)
tree9be8fb7fd57b5132456a7c09d3ffb2f228d628d5
parentad358a80e961f56db5edc81b268448aad1a933fc (diff)
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.
-rw-r--r--src/lib/ecore/Ecore_Common.h3
-rw-r--r--src/lib/eo/Eo.h7
-rw-r--r--src/lib/evas/Evas_Common.h5
3 files changed, 15 insertions, 0 deletions
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index c4d68dc1f1..4c96d17e10 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -959,7 +959,10 @@ enum _Ecore_Exe_Win32_Priority
959}; 959};
960typedef enum _Ecore_Exe_Win32_Priority Ecore_Exe_Win32_Priority; 960typedef enum _Ecore_Exe_Win32_Priority Ecore_Exe_Win32_Priority;
961 961
962#ifdef EFL_BETA_API_SUPPORT
962#include "ecore_exe.eo.h" 963#include "ecore_exe.eo.h"
964#endif
965#include "ecore_exe.eo.legacy.h"
963 966
964#define _ECORE_EXE_EO_CLASS_TYPE 967#define _ECORE_EXE_EO_CLASS_TYPE
965 968
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index f72ee699fc..b3b4df6781 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -119,6 +119,11 @@ typedef struct _Eo_Opaque Eo;
119typedef Eo Eo_Class; 119typedef Eo Eo_Class;
120#define _EO_CLASS_EO_CLASS_TYPE 120#define _EO_CLASS_EO_CLASS_TYPE
121 121
122typedef Eo Eo_Base;
123#define _EO_BASE_EO_CLASS_TYPE
124
125#ifdef EFL_BETA_API_SUPPORT
126
122/** 127/**
123 * @var _eo_class_creation_lock 128 * @var _eo_class_creation_lock
124 * This variable is used for locking purposes in the class_get function 129 * 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
1138EAPI int ___eo_ref2_get(const Eo *obj_id); 1143EAPI int ___eo_ref2_get(const Eo *obj_id);
1139EAPI void ___eo_ref2_reset(const Eo *obj_id); 1144EAPI void ___eo_ref2_reset(const Eo *obj_id);
1140 1145
1146#endif
1147
1141#ifdef __cplusplus 1148#ifdef __cplusplus
1142} 1149}
1143#endif 1150#endif
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index b87f65b519..8efee9cf92 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;
88 * 88 *
89 * @since 1.1 89 * @since 1.1
90 */ 90 */
91// Support not having eo available
92#ifdef EFL_BETA_API_SUPPORT
91typedef Eo_Callback_Priority Evas_Callback_Priority; 93typedef Eo_Callback_Priority Evas_Callback_Priority;
94#else
95typedef short Evas_Callback_Priority;
96#endif
92 97
93typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; /**< A generic rectangle handle */ 98typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; /**< A generic rectangle handle */
94typedef struct _Evas_Point Evas_Point; /**< integer point */ 99typedef struct _Evas_Point Evas_Point; /**< integer point */