summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertise.dev>2020-12-09 13:50:29 -0300
committerFelipe Magno de Almeida <felipe@expertise.dev>2020-12-09 13:52:25 -0300
commit138e9e5294bcc5994853c826da013f0220042c5c (patch)
tree9f6e4f9274ac077586d2676dd0eca6c12675da21
parentcfd17f145ace345f08581cd17b9328eaf56812e2 (diff)
eo: Rename EAPI macro to EO_API in Eo library
Summary: Patch from a series of patches to rename EAPI symbols to specific library DSOs. = The Rationale = This patch is from a series of patches to rename EAPI symbols to specific library DSOs. EAPI was designed to be able to pass `__attribute__ ((visibility ("default")))` for symbols with GCC, which would mean that even if -fvisibility=hidden was used when compiling the library, the needed symbols would get exported. MSVC __almost__ works like GCC (or mingw) in which you can declare everything as export and it will just work (slower, but it will work). But there's a caveat: global variables will not work the same way for MSVC, but works for mingw and GCC. For global variables (as opposed to functions), MSVC requires correct DSO visibility for MSVC: instead of declaring a symbol as export for everything, you need to declare it as import when importing from another DSO and export when defining it locally. With current EAPI definitions, we get the following example working in mingw and MSVC (observe it doesn't define any global variables as exported symbols). Example 1: dll1: ``` EAPI void foo(void); EAPI void bar() { foo(); } ``` dll2: ``` EAPI void foo() { printf ("foo\n"); } ``` This works fine with API defined as __declspec(dllexport) in both cases and for gcc defining as `__atttribute__((visibility("default")))`. However, the following: Example 2: dll1: ``` EAPI extern int foo; EAPI void foobar(void); EAPI void bar() { foo = 5; foobar(); } ``` dll2: ``` EAPI int foo = 0; EAPI void foobar() { printf ("foo %d\n", foo); } ``` This will work on mingw but will not work for MSVC. And that's why LIBAPI is the only solution that works for MSVC. Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com> Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com> Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev> Reviewers: jptiz, lucas, vtorri, woohyun Reviewed By: jptiz, lucas, vtorri Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12203
-rw-r--r--src/lib/eo/Eo.h209
-rw-r--r--src/lib/eo/eo.c120
-rw-r--r--src/lib/eo/eo_add_fallback.c2
-rw-r--r--src/lib/eo/eo_base_class.c58
-rw-r--r--src/lib/eo/eo_internal.h37
-rw-r--r--src/lib/eo/meson.build6
-rw-r--r--src/tests/eo/access/access_inherit.c2
-rw-r--r--src/tests/eo/access/access_inherit.h2
-rw-r--r--src/tests/eo/access/access_simple.c4
-rw-r--r--src/tests/eo/access/access_simple.h2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c134
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.h132
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c2
-rw-r--r--src/tests/eo/constructors/constructors_mixin.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple.h8
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.h4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c8
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.h8
-rw-r--r--src/tests/eo/interface/interface_interface.h2
-rw-r--r--src/tests/eo/interface/interface_interface2.h2
-rw-r--r--src/tests/eo/interface/interface_simple.h8
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.h2
-rw-r--r--src/tests/eo/mixin/mixin_simple.h8
-rw-r--r--src/tests/eo/signals/signals_simple.c6
-rw-r--r--src/tests/eo/signals/signals_simple.h2
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.h16
-rw-r--r--src/tests/eo/suite/eo_test_domain.c2
-rw-r--r--src/tests/eo/suite/eo_test_domain.h6
-rw-r--r--src/tests/eo/suite/eo_test_event.c14
-rw-r--r--src/tests/eo/suite/eo_test_general.c2
-rw-r--r--src/tests/eo/suite/eo_test_reflection_complex_class_structure.c8
-rw-r--r--src/tests/eo/suite/eo_test_reflection_complex_class_structure.h14
-rw-r--r--src/tests/eolian_cxx/a.c3
-rw-r--r--src/tests/eolian_cxx/b.c3
-rw-r--r--src/tests/eolian_cxx/c.c3
-rw-r--r--src/tests/eolian_cxx/complex.c3
-rw-r--r--src/tests/eolian_cxx/complex_cxx.cc3
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_address_of.cc3
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_binding.cc3
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc3
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc3
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc3
-rw-r--r--src/tests/eolian_cxx/generic.c3
-rw-r--r--src/tests/eolian_cxx/meson.build1
-rw-r--r--src/tests/eolian_cxx/name1_name2_type_generation.c3
-rw-r--r--src/tests/eolian_cxx/name_name.c3
-rw-r--r--src/tests/eolian_cxx/name_name_cxx.cc3
-rw-r--r--src/tests/eolian_cxx/simple.c3
52 files changed, 451 insertions, 439 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 0ebbd53e9c..968ffae303 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -4,41 +4,38 @@
4#include <stdarg.h> 4#include <stdarg.h>
5#include <Eina.h> 5#include <Eina.h>
6 6
7#ifdef EAPI 7#ifdef EO_API
8# undef EAPI 8#error EO_API should not be already defined
9#endif 9#endif
10 10
11#define EOLIAN 11#define EOLIAN
12 12
13#ifdef _WIN32 13#ifdef _WIN32
14# ifdef EFL_BUILD 14# ifndef EO_STATIC
15# ifdef DLL_EXPORT 15# ifdef EO_BUILD
16# define EAPI __declspec(dllexport) 16# define EO_API __declspec(dllexport)
17# else 17# else
18# define EAPI 18# define EO_API __declspec(dllimport)
19# endif 19# endif
20# else 20# else
21# define EAPI __declspec(dllimport) 21# define EO_API
22# endif 22# endif
23# define EAPI_WEAK 23# define EO_API_WEAK
24#else 24#else
25# ifdef __GNUC__ 25# ifdef __GNUC__
26# if __GNUC__ >= 4 26# if __GNUC__ >= 4
27# define EAPI __attribute__ ((visibility("default"))) 27# define EO_API __attribute__ ((visibility("default")))
28# define EAPI_WEAK __attribute__ ((weak)) 28# define EO_API_WEAK __attribute__ ((weak))
29# else 29# else
30# define EAPI 30# define EO_API
31# define EAPI_WEAK 31# define EO_API_WEAK
32# endif 32# endif
33# else 33# else
34# define EAPI 34# define EO_API
35# define EAPI_WEAK 35# define EO_API_WEAK
36# endif 36# endif
37#endif 37#endif
38 38
39/* When used, this indicates that the function is an Eo API. */
40#define EOAPI EAPI EAPI_WEAK
41
42#ifdef __cplusplus 39#ifdef __cplusplus
43extern "C" { 40extern "C" {
44#endif 41#endif
@@ -191,7 +188,7 @@ typedef Eo Efl_Object;
191 * Don't touch it if you don't know what you are doing. 188 * Don't touch it if you don't know what you are doing.
192 * @internal 189 * @internal
193 */ 190 */
194EAPI extern Eina_Lock _efl_class_creation_lock; 191EO_API extern Eina_Lock _efl_class_creation_lock;
195 192
196/** 193/**
197 * @var _efl_object_init_generation 194 * @var _efl_object_init_generation
@@ -200,7 +197,7 @@ EAPI extern Eina_Lock _efl_class_creation_lock;
200 * every call to shutdown that actually shuts down eo. 197 * every call to shutdown that actually shuts down eo.
201 * @internal 198 * @internal
202 */ 199 */
203EAPI extern unsigned int _efl_object_init_generation; 200EO_API extern unsigned int _efl_object_init_generation;
204 201
205/** 202/**
206 * @typedef Efl_Del_Intercept 203 * @typedef Efl_Del_Intercept
@@ -301,7 +298,7 @@ typedef struct _Efl_Callback_Array_Item_Full
301 * 298 *
302 * @return Return @c true when the callback has been successfully added. 299 * @return Return @c true when the callback has been successfully added.
303 */ 300 */
304EOAPI Eina_Bool efl_event_callback_priority_add(Eo *obj, const Efl_Event_Description *desc, Efl_Callback_Priority priority, Efl_Event_Cb cb, const void *data); 301EO_API Eina_Bool efl_event_callback_priority_add(Eo *obj, const Efl_Event_Description *desc, Efl_Callback_Priority priority, Efl_Event_Cb cb, const void *data);
305 302
306/** 303/**
307 * @brief Delete a callback with a specific data associated with it for an event. 304 * @brief Delete a callback with a specific data associated with it for an event.
@@ -315,7 +312,7 @@ EOAPI Eina_Bool efl_event_callback_priority_add(Eo *obj, const Efl_Event_Descrip
315 * 312 *
316 * @return Return @c true when the callback has been successfully removed. 313 * @return Return @c true when the callback has been successfully removed.
317 */ 314 */
318EOAPI Eina_Bool efl_event_callback_del(Eo *obj, const Efl_Event_Description *desc, Efl_Event_Cb func, const void *user_data); 315EO_API Eina_Bool efl_event_callback_del(Eo *obj, const Efl_Event_Description *desc, Efl_Event_Cb func, const void *user_data);
319 316
320/** 317/**
321 * @brief Get the Eina_Future scheduler that trigger them on a specific set of events on an object. 318 * @brief Get the Eina_Future scheduler that trigger them on a specific set of events on an object.
@@ -327,7 +324,7 @@ EOAPI Eina_Bool efl_event_callback_del(Eo *obj, const Efl_Event_Description *des
327 * 324 *
328 * @note You must use EFL_SCHEDULER_ARRAY_DEFINE() to create the @p array. 325 * @note You must use EFL_SCHEDULER_ARRAY_DEFINE() to create the @p array.
329 */ 326 */
330EOAPI Eina_Future_Scheduler *efl_event_future_scheduler_get(const Eo *obj, Efl_Callback_Array_Item *array); 327EO_API Eina_Future_Scheduler *efl_event_future_scheduler_get(const Eo *obj, Efl_Callback_Array_Item *array);
331 328
332/** 329/**
333 * @brief Add an array of callbacks created by @ref EFL_CALLBACKS_ARRAY_DEFINE 330 * @brief Add an array of callbacks created by @ref EFL_CALLBACKS_ARRAY_DEFINE
@@ -346,7 +343,7 @@ EOAPI Eina_Future_Scheduler *efl_event_future_scheduler_get(const Eo *obj, Efl_C
346 * 343 *
347 * @return Return @c true when the callback has been successfully added. 344 * @return Return @c true when the callback has been successfully added.
348 */ 345 */
349EOAPI Eina_Bool efl_event_callback_array_priority_add(Eo *obj, const Efl_Callback_Array_Item *array, Efl_Callback_Priority priority, const void *data); 346EO_API Eina_Bool efl_event_callback_array_priority_add(Eo *obj, const Efl_Callback_Array_Item *array, Efl_Callback_Priority priority, const void *data);
350 347
351/** 348/**
352 * @brief Del a callback array with a specific data associated to it for an 349 * @brief Del a callback array with a specific data associated to it for an
@@ -358,7 +355,7 @@ EOAPI Eina_Bool efl_event_callback_array_priority_add(Eo *obj, const Efl_Callbac
358 * 355 *
359 * @return Return @c true when the callback has been successfully removed. 356 * @return Return @c true when the callback has been successfully removed.
360 */ 357 */
361EOAPI Eina_Bool efl_event_callback_array_del(Eo *obj, const Efl_Callback_Array_Item *array, const void *user_data); 358EO_API Eina_Bool efl_event_callback_array_del(Eo *obj, const Efl_Callback_Array_Item *array, const void *user_data);
362 359
363/** 360/**
364 * @brief Call the callbacks for an event of an object. 361 * @brief Call the callbacks for an event of an object.
@@ -371,7 +368,7 @@ EOAPI Eina_Bool efl_event_callback_array_del(Eo *obj, const Efl_Callback_Array_I
371 * 368 *
372 * @return @c false If one of the callbacks aborted the call, @c true otherwise 369 * @return @c false If one of the callbacks aborted the call, @c true otherwise
373 */ 370 */
374EOAPI Eina_Bool efl_event_callback_call(Eo *obj, const Efl_Event_Description *desc, void *event_info); 371EO_API Eina_Bool efl_event_callback_call(Eo *obj, const Efl_Event_Description *desc, void *event_info);
375 372
376/** 373/**
377 * @brief Call the callbacks for an event of an object. 374 * @brief Call the callbacks for an event of an object.
@@ -386,7 +383,7 @@ EOAPI Eina_Bool efl_event_callback_call(Eo *obj, const Efl_Event_Description *de
386 * 383 *
387 * @since 1.19 384 * @since 1.19
388 */ 385 */
389EOAPI Eina_Bool efl_event_callback_legacy_call(Eo *obj, const Efl_Event_Description *desc, void *event_info); 386EO_API Eina_Bool efl_event_callback_legacy_call(Eo *obj, const Efl_Event_Description *desc, void *event_info);
390 387
391 388
392/** 389/**
@@ -578,7 +575,7 @@ typedef struct _Efl_Future_Cb_Desc {
578 * @see #Efl_Future_Cb_Desc 575 * @see #Efl_Future_Cb_Desc
579 * @see efl_key_data_set() 576 * @see efl_key_data_set()
580 */ 577 */
581EOAPI Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_Cb_Desc desc) EINA_ARG_NONNULL(1); 578EO_API Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_Cb_Desc desc) EINA_ARG_NONNULL(1);
582 579
583/** 580/**
584 * Syntax suger over efl_future_cb_from_desc() 581 * Syntax suger over efl_future_cb_from_desc()
@@ -625,7 +622,7 @@ EOAPI Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_C
625 * @see eina_future_then_from_desc() 622 * @see eina_future_then_from_desc()
626 * @see #Efl_Future_Cb_Desc 623 * @see #Efl_Future_Cb_Desc
627 */ 624 */
628EOAPI Eina_Future *efl_future_chain_array(Eo *obj, Eina_Future *prev, const Efl_Future_Cb_Desc descs[]) EINA_ARG_NONNULL(1, 2); 625EO_API Eina_Future *efl_future_chain_array(Eo *obj, Eina_Future *prev, const Efl_Future_Cb_Desc descs[]) EINA_ARG_NONNULL(1, 2);
629 626
630/** 627/**
631 * Syntax suger over efl_future_chain_array() 628 * Syntax suger over efl_future_chain_array()
@@ -659,13 +656,13 @@ typedef struct _Efl_Dbg_Info
659 * 656 *
660 * @param[in] root_node the tree Node 657 * @param[in] root_node the tree Node
661 */ 658 */
662EOAPI void efl_dbg_info_get(Eo *obj, Efl_Dbg_Info *root_node); 659EO_API void efl_dbg_info_get(Eo *obj, Efl_Dbg_Info *root_node);
663 660
664/** 661/**
665 * @var EFL_DBG_INFO_TYPE 662 * @var EFL_DBG_INFO_TYPE
666 * The Eina_Value_Type for the debug info. 663 * The Eina_Value_Type for the debug info.
667 */ 664 */
668EAPI extern const Eina_Value_Type *EFL_DBG_INFO_TYPE; 665EO_API extern const Eina_Value_Type *EFL_DBG_INFO_TYPE;
669 666
670/** 667/**
671 * Creates a list inside debug info list. 668 * Creates a list inside debug info list.
@@ -715,7 +712,7 @@ do { \
715 * Frees the Efl_Dbg_Info tree. (The whole tree recursively). 712 * Frees the Efl_Dbg_Info tree. (The whole tree recursively).
716 * @param[in] info The tree to delete. 713 * @param[in] info The tree to delete.
717 */ 714 */
718EAPI void efl_dbg_info_free(Efl_Dbg_Info *info); 715EO_API void efl_dbg_info_free(Efl_Dbg_Info *info);
719 716
720/** 717/**
721 * @} 718 * @}
@@ -850,7 +847,7 @@ typedef enum _Efl_Class_Type Efl_Class_Type;
850 847
851typedef struct _Efl_Op_Description 848typedef struct _Efl_Op_Description
852{ 849{
853 void *api_func; /**< The EAPI function offering this op. (The name of the func on windows) */ 850 void *api_func; /**< The EO_API function offering this op. (The name of the func on windows) */
854 void *func; /**< The static function to call for the op. */ 851 void *func; /**< The static function to call for the op. */
855} Efl_Op_Description; 852} Efl_Op_Description;
856 853
@@ -937,7 +934,7 @@ typedef struct _Efl_Class_Description Efl_Class_Description;
937 * 934 *
938 * @see #EFL_DEFINE_CLASS 935 * @see #EFL_DEFINE_CLASS
939 */ 936 */
940EAPI const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent, ...); 937EO_API const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent, ...);
941 938
942/** 939/**
943 * @brief Set the functions of a class 940 * @brief Set the functions of a class
@@ -952,7 +949,7 @@ EAPI const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl
952 * efl_property_reflection_set() or efl_property_reflection_get() is called. 949 * efl_property_reflection_set() or efl_property_reflection_get() is called.
953 * @see #EFL_DEFINE_CLASS 950 * @see #EFL_DEFINE_CLASS
954 */ 951 */
955EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Property_Reflection_Ops *reflection_table); 952EO_API Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Property_Reflection_Ops *reflection_table);
956 953
957/** 954/**
958 * @brief Override Eo functions of this object. 955 * @brief Override Eo functions of this object.
@@ -976,7 +973,7 @@ EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Obje
976 * 973 *
977 * @see EFL_OPS_DEFINE 974 * @see EFL_OPS_DEFINE
978 */ 975 */
979EAPI Eina_Bool efl_object_override(Eo *obj, const Efl_Object_Ops *ops); 976EO_API Eina_Bool efl_object_override(Eo *obj, const Efl_Object_Ops *ops);
980 977
981/** 978/**
982 * @brief Define an array of override functions for @ref efl_object_override 979 * @brief Define an array of override functions for @ref efl_object_override
@@ -1007,7 +1004,7 @@ EAPI Eina_Bool efl_object_override(Eo *obj, const Efl_Object_Ops *ops);
1007 * Note: that an Efl_Class is also an Efl_Object, so if you pass an Efl_Class 1004 * Note: that an Efl_Class is also an Efl_Object, so if you pass an Efl_Class
1008 * as obj, it will check if that class contain klass. 1005 * as obj, it will check if that class contain klass.
1009 */ 1006 */
1010EAPI Eina_Bool efl_isa(const Eo *obj, const Efl_Class *klass); 1007EO_API Eina_Bool efl_isa(const Eo *obj, const Efl_Class *klass);
1011 1008
1012/** 1009/**
1013 * @brief Gets the name of the passed class. 1010 * @brief Gets the name of the passed class.
@@ -1016,7 +1013,7 @@ EAPI Eina_Bool efl_isa(const Eo *obj, const Efl_Class *klass);
1016 * 1013 *
1017 * @see efl_class_get() 1014 * @see efl_class_get()
1018 */ 1015 */
1019EAPI const char *efl_class_name_get(const Efl_Class *klass); 1016EO_API const char *efl_class_name_get(const Efl_Class *klass);
1020 1017
1021/** 1018/**
1022 * @brief Gets the amount of memory this class object would use. 1019 * @brief Gets the amount of memory this class object would use.
@@ -1025,7 +1022,7 @@ EAPI const char *efl_class_name_get(const Efl_Class *klass);
1025 * 1022 *
1026 * @see efl_class_get() 1023 * @see efl_class_get()
1027 */ 1024 */
1028EAPI size_t efl_class_memory_size_get(const Efl_Class *klass); 1025EO_API size_t efl_class_memory_size_get(const Efl_Class *klass);
1029 1026
1030/** 1027/**
1031 * @brief Gets a debug name for this object 1028 * @brief Gets a debug name for this object
@@ -1042,7 +1039,7 @@ EAPI size_t efl_class_memory_size_get(const Efl_Class *klass);
1042 * 1039 *
1043 * @since 1.21 1040 * @since 1.21
1044 */ 1041 */
1045EAPI const char *efl_debug_name_get(const Eo *obj_id); 1042EO_API const char *efl_debug_name_get(const Eo *obj_id);
1046 1043
1047/** 1044/**
1048 * @} 1045 * @}
@@ -1054,7 +1051,7 @@ EAPI const char *efl_debug_name_get(const Eo *obj_id);
1054 * 1051 *
1055 * @see eo_shutdown() 1052 * @see eo_shutdown()
1056 */ 1053 */
1057EAPI Eina_Bool efl_object_init(void); 1054EO_API Eina_Bool efl_object_init(void);
1058 1055
1059/** 1056/**
1060 * @brief Shutdown the eo subsystem 1057 * @brief Shutdown the eo subsystem
@@ -1062,7 +1059,7 @@ EAPI Eina_Bool efl_object_init(void);
1062 * 1059 *
1063 * @see efl_object_init() 1060 * @see efl_object_init()
1064 */ 1061 */
1065EAPI Eina_Bool efl_object_shutdown(void); 1062EO_API Eina_Bool efl_object_shutdown(void);
1066 1063
1067#ifdef EFL_BETA_API_SUPPORT 1064#ifdef EFL_BETA_API_SUPPORT
1068 1065
@@ -1110,7 +1107,7 @@ typedef struct _Efl_Domain_Data Efl_Domain_Data;
1110 * @see efl_domain_data_return() 1107 * @see efl_domain_data_return()
1111 * @see efl_compatible() 1108 * @see efl_compatible()
1112 */ 1109 */
1113EAPI Efl_Id_Domain efl_domain_get(void); 1110EO_API Efl_Id_Domain efl_domain_get(void);
1114 1111
1115/** 1112/**
1116 * @brief Switch the native domain for the current thread. 1113 * @brief Switch the native domain for the current thread.
@@ -1125,7 +1122,7 @@ EAPI Efl_Id_Domain efl_domain_get(void);
1125 * 1122 *
1126 * @see efl_domain_get() 1123 * @see efl_domain_get()
1127 */ 1124 */
1128EAPI Eina_Bool efl_domain_switch(Efl_Id_Domain domain); 1125EO_API Eina_Bool efl_domain_switch(Efl_Id_Domain domain);
1129 1126
1130/** 1127/**
1131 * @brief Get the current domain used for allocating new objects 1128 * @brief Get the current domain used for allocating new objects
@@ -1138,7 +1135,7 @@ EAPI Eina_Bool efl_domain_switch(Efl_Id_Domain domain);
1138 * 1135 *
1139 * @see efl_domain_get() 1136 * @see efl_domain_get()
1140 */ 1137 */
1141EAPI Efl_Id_Domain efl_domain_current_get(void); 1138EO_API Efl_Id_Domain efl_domain_current_get(void);
1142 1139
1143/** 1140/**
1144 * @brief Set the current domain used for allocating new objects. 1141 * @brief Set the current domain used for allocating new objects.
@@ -1152,7 +1149,7 @@ EAPI Efl_Id_Domain efl_domain_current_get(void);
1152 * 1149 *
1153 * @see efl_domain_get() 1150 * @see efl_domain_get()
1154 */ 1151 */
1155EAPI Eina_Bool efl_domain_current_set(Efl_Id_Domain domain); 1152EO_API Eina_Bool efl_domain_current_set(Efl_Id_Domain domain);
1156 1153
1157/** 1154/**
1158 * @brief Push a new domain onto the domain stack. 1155 * @brief Push a new domain onto the domain stack.
@@ -1165,7 +1162,7 @@ EAPI Eina_Bool efl_domain_current_set(Efl_Id_Domain domain);
1165 * 1162 *
1166 * @see efl_domain_get() 1163 * @see efl_domain_get()
1167 */ 1164 */
1168EAPI Eina_Bool efl_domain_current_push(Efl_Id_Domain domain); 1165EO_API Eina_Bool efl_domain_current_push(Efl_Id_Domain domain);
1169 1166
1170/** 1167/**
1171 * @brief Pop a previously pushed domain from the domain stack 1168 * @brief Pop a previously pushed domain from the domain stack
@@ -1175,7 +1172,7 @@ EAPI Eina_Bool efl_domain_current_push(Efl_Id_Domain domain);
1175 * 1172 *
1176 * @see efl_domain_get() 1173 * @see efl_domain_get()
1177 */ 1174 */
1178EAPI void efl_domain_current_pop(void); 1175EO_API void efl_domain_current_pop(void);
1179 1176
1180/** 1177/**
1181 * @brief Get an opaque handle to the local native domain eoid data 1178 * @brief Get an opaque handle to the local native domain eoid data
@@ -1191,7 +1188,7 @@ EAPI void efl_domain_current_pop(void);
1191 * 1188 *
1192 * @see efl_domain_get() 1189 * @see efl_domain_get()
1193 */ 1190 */
1194EAPI Efl_Domain_Data *efl_domain_data_get(void); 1191EO_API Efl_Domain_Data *efl_domain_data_get(void);
1195 1192
1196/** 1193/**
1197 * @brief Adopt a single extra domain to be the current domain 1194 * @brief Adopt a single extra domain to be the current domain
@@ -1214,7 +1211,7 @@ EAPI Efl_Domain_Data *efl_domain_data_get(void);
1214 * 1211 *
1215 * @see efl_domain_get() 1212 * @see efl_domain_get()
1216 */ 1213 */
1217EAPI Efl_Id_Domain efl_domain_data_adopt(Efl_Domain_Data *data_in); 1214EO_API Efl_Id_Domain efl_domain_data_adopt(Efl_Domain_Data *data_in);
1218 1215
1219/** 1216/**
1220 * @brief Return a domain to its original owning thread 1217 * @brief Return a domain to its original owning thread
@@ -1230,7 +1227,7 @@ EAPI Efl_Id_Domain efl_domain_data_adopt(Efl_Domain_Data *data_in);
1230 * 1227 *
1231 * @see efl_domain_get() 1228 * @see efl_domain_get()
1232 */ 1229 */
1233EAPI Eina_Bool efl_domain_data_return(Efl_Id_Domain domain); 1230EO_API Eina_Bool efl_domain_data_return(Efl_Id_Domain domain);
1234 1231
1235/** 1232/**
1236 * @brief Check if 2 objects are compatible 1233 * @brief Check if 2 objects are compatible
@@ -1246,7 +1243,7 @@ EAPI Eina_Bool efl_domain_data_return(Efl_Id_Domain domain);
1246 * 1243 *
1247 * @see efl_domain_get() 1244 * @see efl_domain_get()
1248 */ 1245 */
1249EAPI Eina_Bool efl_compatible(const Eo *obj, const Eo *obj_target); 1246EO_API Eina_Bool efl_compatible(const Eo *obj, const Eo *obj_target);
1250 1247
1251#endif 1248#endif
1252 1249
@@ -1315,7 +1312,7 @@ __##Name##_failed: EINA_COLD; \
1315#define _EFL_OBJECT_API_AFTER_HOOK 1312#define _EFL_OBJECT_API_AFTER_HOOK
1316#define _EFL_OBJECT_API_CALL_HOOK(x) x 1313#define _EFL_OBJECT_API_CALL_HOOK(x) x
1317 1314
1318// to define an EAPI function 1315// to define an EO_API function
1319#define _EFL_OBJECT_FUNC_BODY(Name, ObjType, Ret, DefRet, ErrorCase) \ 1316#define _EFL_OBJECT_FUNC_BODY(Name, ObjType, Ret, DefRet, ErrorCase) \
1320 Ret \ 1317 Ret \
1321 Name(ObjType obj) \ 1318 Name(ObjType obj) \
@@ -1406,17 +1403,17 @@ __##Name##_failed: EINA_COLD; \
1406#define EFL_OBJECT_OP_FUNC(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private } 1403#define EFL_OBJECT_OP_FUNC(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private }
1407 1404
1408// returns the OP id corresponding to the given api_func 1405// returns the OP id corresponding to the given api_func
1409EAPI Efl_Object_Op _efl_object_api_op_id_get(const void *api_func) EINA_DEPRECATED; 1406EO_API Efl_Object_Op _efl_object_api_op_id_get(const void *api_func) EINA_DEPRECATED;
1410EAPI Efl_Object_Op _efl_object_op_api_id_get(const void *api_func, const Eo *obj, const char *api_func_name, const char *file, int line) EINA_ARG_NONNULL(1, 2, 3, 4) EINA_WARN_UNUSED_RESULT; 1407EO_API Efl_Object_Op _efl_object_op_api_id_get(const void *api_func, const Eo *obj, const char *api_func_name, const char *file, int line) EINA_ARG_NONNULL(1, 2, 3, 4) EINA_WARN_UNUSED_RESULT;
1411 1408
1412// gets the real function pointer and the object data 1409// gets the real function pointer and the object data
1413EAPI Eina_Bool _efl_object_call_resolve(Eo *obj, const char *func_name, Efl_Object_Op_Call_Data *call, Efl_Object_Op op, const char *file, int line); 1410EO_API Eina_Bool _efl_object_call_resolve(Eo *obj, const char *func_name, Efl_Object_Op_Call_Data *call, Efl_Object_Op op, const char *file, int line);
1414 1411
1415// end of the eo call barrier, unref the obj 1412// end of the eo call barrier, unref the obj
1416EAPI void _efl_object_call_end(Efl_Object_Op_Call_Data *call); 1413EO_API void _efl_object_call_end(Efl_Object_Op_Call_Data *call);
1417 1414
1418// end of the efl_add. Calls finalize among others 1415// end of the efl_add. Calls finalize among others
1419EAPI Eo * _efl_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback); 1416EO_API Eo * _efl_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback);
1420 1417
1421/*****************************************************************************/ 1418/*****************************************************************************/
1422 1419
@@ -1457,7 +1454,7 @@ EAPI Eo * _efl_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback);
1457 * 1454 *
1458 * @see efl_cast 1455 * @see efl_cast
1459 */ 1456 */
1460EAPI Eo *efl_super(const Eo *obj, const Efl_Class *cur_klass); 1457EO_API Eo *efl_super(const Eo *obj, const Efl_Class *cur_klass);
1461 1458
1462/** 1459/**
1463 * @brief Prepare a call to cast to a parent class implementation of a function. 1460 * @brief Prepare a call to cast to a parent class implementation of a function.
@@ -1489,7 +1486,7 @@ EAPI Eo *efl_super(const Eo *obj, const Efl_Class *cur_klass);
1489 * 1486 *
1490 * @since 1.20 1487 * @since 1.20
1491 */ 1488 */
1492EAPI Eo *efl_cast(const Eo *obj, const Efl_Class *cur_klass); 1489EO_API Eo *efl_cast(const Eo *obj, const Efl_Class *cur_klass);
1493 1490
1494/*****************************************************************************/ 1491/*****************************************************************************/
1495 1492
@@ -1500,9 +1497,9 @@ EAPI Eo *efl_cast(const Eo *obj, const Efl_Class *cur_klass);
1500 * 1497 *
1501 * @see efl_class_name_get() 1498 * @see efl_class_name_get()
1502 */ 1499 */
1503EAPI const Efl_Class *efl_class_get(const Eo *obj); 1500EO_API const Efl_Class *efl_class_get(const Eo *obj);
1504 1501
1505EAPI Eo *_efl_added_get(void); 1502EO_API Eo *_efl_added_get(void);
1506 1503
1507/* Check if GCC compatible (both GCC and clang define this) */ 1504/* Check if GCC compatible (both GCC and clang define this) */
1508#if defined(__GNUC__) && !defined(_EO_ADD_FALLBACK_FORCE) 1505#if defined(__GNUC__) && !defined(_EO_ADD_FALLBACK_FORCE)
@@ -1590,7 +1587,7 @@ EAPI Eo *_efl_added_get(void);
1590 */ 1587 */
1591#define efl_new(klass, ...) efl_add_ref(klass, NULL, ##__VA_ARGS__) 1588#define efl_new(klass, ...) efl_add_ref(klass, NULL, ##__VA_ARGS__)
1592 1589
1593EAPI Eo * _efl_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback); 1590EO_API Eo * _efl_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback);
1594 1591
1595/** 1592/**
1596 * @typedef Efl_Substitute_Ctor_Cb 1593 * @typedef Efl_Substitute_Ctor_Cb
@@ -1619,7 +1616,7 @@ typedef Eo *(*Efl_Substitute_Ctor_Cb)(void *data, Eo *obj_id);
1619 * @param sub_ctor_data Additional data to be passed to the @p substitute_ctor callback. 1616 * @param sub_ctor_data Additional data to be passed to the @p substitute_ctor callback.
1620 * @return An handle to the new object on success, NULL otherwise. 1617 * @return An handle to the new object on success, NULL otherwise.
1621 */ 1618 */
1622EAPI Eo * _efl_add_internal_start_bindings(const char *file, int line, const Efl_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback, Efl_Substitute_Ctor_Cb substitute_ctor, void *sub_ctor_data); 1619EO_API Eo * _efl_add_internal_start_bindings(const char *file, int line, const Efl_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback, Efl_Substitute_Ctor_Cb substitute_ctor, void *sub_ctor_data);
1623 1620
1624/** 1621/**
1625 * @brief Unrefs the object and reparents it to NULL. 1622 * @brief Unrefs the object and reparents it to NULL.
@@ -1633,7 +1630,7 @@ EAPI Eo * _efl_add_internal_start_bindings(const char *file, int line, const Efl
1633 * 1630 *
1634 * @ingroup Efl_Object 1631 * @ingroup Efl_Object
1635 */ 1632 */
1636EAPI void efl_del(const Eo *obj); 1633EO_API void efl_del(const Eo *obj);
1637 1634
1638/** 1635/**
1639 * @brief Set an override for a class 1636 * @brief Set an override for a class
@@ -1647,7 +1644,7 @@ EAPI void efl_del(const Eo *obj);
1647 * 1644 *
1648 * @ingroup Efl_Object 1645 * @ingroup Efl_Object
1649 */ 1646 */
1650EAPI Eina_Bool efl_class_override_register(const Efl_Class *klass, const Efl_Class *override); 1647EO_API Eina_Bool efl_class_override_register(const Efl_Class *klass, const Efl_Class *override);
1651 1648
1652/** 1649/**
1653 * @brief Unset an override for a class 1650 * @brief Unset an override for a class
@@ -1661,7 +1658,7 @@ EAPI Eina_Bool efl_class_override_register(const Efl_Class *klass, const Efl_Cla
1661 * 1658 *
1662 * @ingroup Efl_Object 1659 * @ingroup Efl_Object
1663 */ 1660 */
1664EAPI Eina_Bool efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override); 1661EO_API Eina_Bool efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override);
1665/** 1662/**
1666 * @brief Get a pointer to the data of an object for a specific class. 1663 * @brief Get a pointer to the data of an object for a specific class.
1667 * 1664 *
@@ -1676,7 +1673,7 @@ EAPI Eina_Bool efl_class_override_unregister(const Efl_Class *klass, const Efl_C
1676 * @see efl_data_unref() 1673 * @see efl_data_unref()
1677 * @see efl_data_scope_safe_get() 1674 * @see efl_data_scope_safe_get()
1678 */ 1675 */
1679EAPI void *efl_data_scope_get(const Eo *obj, const Efl_Class *klass); 1676EO_API void *efl_data_scope_get(const Eo *obj, const Efl_Class *klass);
1680 1677
1681/** 1678/**
1682 * @brief Safely get a pointer to the data of an object for a specific class. 1679 * @brief Safely get a pointer to the data of an object for a specific class.
@@ -1702,7 +1699,7 @@ EAPI void *efl_data_scope_get(const Eo *obj, const Efl_Class *klass);
1702 * 1699 *
1703 * @since 1.20 1700 * @since 1.20
1704 */ 1701 */
1705EAPI void *efl_data_scope_safe_get(const Eo *obj, const Efl_Class *klass); 1702EO_API void *efl_data_scope_safe_get(const Eo *obj, const Efl_Class *klass);
1706 1703
1707/** 1704/**
1708 * @def efl_data_xref(obj, klass, ref_obj) 1705 * @def efl_data_xref(obj, klass, ref_obj)
@@ -1730,7 +1727,7 @@ EAPI void *efl_data_scope_safe_get(const Eo *obj, const Efl_Class *klass);
1730 * 1727 *
1731 * @see efl_data_xunref_internal() 1728 * @see efl_data_xunref_internal()
1732 */ 1729 */
1733EAPI void *efl_data_xref_internal(const char *file, int line, const Eo *obj, const Efl_Class *klass, const Eo *ref_obj); 1730EO_API void *efl_data_xref_internal(const char *file, int line, const Eo *obj, const Efl_Class *klass, const Eo *ref_obj);
1734 1731
1735/** 1732/**
1736 * @def efl_data_xunref(obj, data, ref_obj) 1733 * @def efl_data_xunref(obj, data, ref_obj)
@@ -1757,7 +1754,7 @@ EAPI void *efl_data_xref_internal(const char *file, int line, const Eo *obj, con
1757 * 1754 *
1758 * @see efl_data_xref_internal() 1755 * @see efl_data_xref_internal()
1759 */ 1756 */
1760EAPI void efl_data_xunref_internal(const Eo *obj, void *data, const Eo *ref_obj); 1757EO_API void efl_data_xunref_internal(const Eo *obj, void *data, const Eo *ref_obj);
1761 1758
1762/** 1759/**
1763 * @brief Increment the object's reference count by 1. 1760 * @brief Increment the object's reference count by 1.
@@ -1774,7 +1771,7 @@ EAPI void efl_data_xunref_internal(const Eo *obj, void *data, const Eo *ref_obj)
1774 * @see efl_unref() 1771 * @see efl_unref()
1775 * @see efl_ref_count() 1772 * @see efl_ref_count()
1776 */ 1773 */
1777EAPI Eo *efl_ref(const Eo *obj); 1774EO_API Eo *efl_ref(const Eo *obj);
1778 1775
1779/** 1776/**
1780 * @brief Decrement the object's reference count by 1 and free it if needed. 1777 * @brief Decrement the object's reference count by 1 and free it if needed.
@@ -1783,7 +1780,7 @@ EAPI Eo *efl_ref(const Eo *obj);
1783 * @see efl_ref() 1780 * @see efl_ref()
1784 * @see efl_ref_count() 1781 * @see efl_ref_count()
1785 */ 1782 */
1786EAPI void efl_unref(const Eo *obj); 1783EO_API void efl_unref(const Eo *obj);
1787 1784
1788/** 1785/**
1789 * @brief Return the ref count of the object passed. 1786 * @brief Return the ref count of the object passed.
@@ -1793,7 +1790,7 @@ EAPI void efl_unref(const Eo *obj);
1793 * @see efl_ref() 1790 * @see efl_ref()
1794 * @see efl_unref() 1791 * @see efl_unref()
1795 */ 1792 */
1796EAPI int efl_ref_count(const Eo *obj); 1793EO_API int efl_ref_count(const Eo *obj);
1797 1794
1798/** 1795/**
1799 * @brief Set a deletion interceptor function. 1796 * @brief Set a deletion interceptor function.
@@ -1824,7 +1821,7 @@ EAPI int efl_ref_count(const Eo *obj);
1824 * @see efl_unref() 1821 * @see efl_unref()
1825 * @see efl_del() 1822 * @see efl_del()
1826 */ 1823 */
1827EAPI void efl_del_intercept_set(Eo *obj, Efl_Del_Intercept del_intercept_func); 1824EO_API void efl_del_intercept_set(Eo *obj, Efl_Del_Intercept del_intercept_func);
1828 1825
1829/** 1826/**
1830 * @brief Get the deletion interceptor function 1827 * @brief Get the deletion interceptor function
@@ -1841,7 +1838,7 @@ EAPI void efl_del_intercept_set(Eo *obj, Efl_Del_Intercept del_intercept_func);
1841 * 1838 *
1842 * @see efl_del_intercept_set() 1839 * @see efl_del_intercept_set()
1843 */ 1840 */
1844EAPI Efl_Del_Intercept efl_del_intercept_get(const Eo *obj); 1841EO_API Efl_Del_Intercept efl_del_intercept_get(const Eo *obj);
1845 1842
1846/** 1843/**
1847 * @brief Clears the object so it can be reused (for example in a cache). 1844 * @brief Clears the object so it can be reused (for example in a cache).
@@ -1852,7 +1849,7 @@ EAPI Efl_Del_Intercept efl_del_intercept_get(const Eo *obj);
1852 * 1849 *
1853 * @see efl_del_intercept_set() 1850 * @see efl_del_intercept_set()
1854 */ 1851 */
1855EAPI void efl_reuse(const Eo *obj); 1852EO_API void efl_reuse(const Eo *obj);
1856 1853
1857/** 1854/**
1858 * @def efl_xref(obj, ref_obj) 1855 * @def efl_xref(obj, ref_obj)
@@ -1875,7 +1872,7 @@ EAPI void efl_reuse(const Eo *obj);
1875 * 1872 *
1876 * @see efl_xunref() 1873 * @see efl_xunref()
1877 */ 1874 */
1878EAPI Eo *efl_xref_internal(const char *file, int line, Eo *obj, const Eo *ref_obj); 1875EO_API Eo *efl_xref_internal(const char *file, int line, Eo *obj, const Eo *ref_obj);
1879 1876
1880/** 1877/**
1881 * @brief Decrement the object's reference count by 1 and free it if needed. Will free the ref associated with ref_obj). 1878 * @brief Decrement the object's reference count by 1 and free it if needed. Will free the ref associated with ref_obj).
@@ -1888,7 +1885,7 @@ EAPI Eo *efl_xref_internal(const char *file, int line, Eo *obj, const Eo *ref_ob
1888 * 1885 *
1889 * @see efl_xref_internal() 1886 * @see efl_xref_internal()
1890 */ 1887 */
1891EAPI void efl_xunref(Eo *obj, const Eo *ref_obj); 1888EO_API void efl_xunref(Eo *obj, const Eo *ref_obj);
1892 1889
1893/** 1890/**
1894 * @brief Add a new weak reference to obj. 1891 * @brief Add a new weak reference to obj.
@@ -1900,7 +1897,7 @@ EAPI void efl_xunref(Eo *obj, const Eo *ref_obj);
1900 * 1897 *
1901 * @param[in] wref The weak ref 1898 * @param[in] wref The weak ref
1902 */ 1899 */
1903EOAPI void efl_wref_add(Eo *obj, Efl_Object **wref); 1900EO_API void efl_wref_add(Eo *obj, Efl_Object **wref);
1904 1901
1905/** 1902/**
1906 * @brief Delete the weak reference passed. 1903 * @brief Delete the weak reference passed.
@@ -1909,7 +1906,7 @@ EOAPI void efl_wref_add(Eo *obj, Efl_Object **wref);
1909 * 1906 *
1910 * @param[in] wref The weak ref 1907 * @param[in] wref The weak ref
1911 */ 1908 */
1912EOAPI void efl_wref_del(Eo *obj, Efl_Object **wref); 1909EO_API void efl_wref_del(Eo *obj, Efl_Object **wref);
1913 1910
1914/** 1911/**
1915 * @brief Generic data with string key on an object. 1912 * @brief Generic data with string key on an object.
@@ -1919,7 +1916,7 @@ EOAPI void efl_wref_del(Eo *obj, Efl_Object **wref);
1919 * @param[in] key The key associated with the data 1916 * @param[in] key The key associated with the data
1920 * @param[in] data The data to set 1917 * @param[in] data The data to set
1921 */ 1918 */
1922EOAPI void efl_key_data_set(Eo *obj, const char * key, const void *data); 1919EO_API void efl_key_data_set(Eo *obj, const char * key, const void *data);
1923 1920
1924/** 1921/**
1925 * @brief Generic data with string key on an object. 1922 * @brief Generic data with string key on an object.
@@ -1930,7 +1927,7 @@ EOAPI void efl_key_data_set(Eo *obj, const char * key, const void *data);
1930 * 1927 *
1931 * @return The data to set 1928 * @return The data to set
1932 */ 1929 */
1933EOAPI void *efl_key_data_get(const Eo *obj, const char * key); 1930EO_API void *efl_key_data_get(const Eo *obj, const char * key);
1934 1931
1935/** 1932/**
1936 * @brief Generic object reference with string key to object. 1933 * @brief Generic object reference with string key to object.
@@ -1945,7 +1942,7 @@ EOAPI void *efl_key_data_get(const Eo *obj, const char * key);
1945 * @param[in] key The key associated with the object ref 1942 * @param[in] key The key associated with the object ref
1946 * @param[in] objdata The object to set 1943 * @param[in] objdata The object to set
1947 */ 1944 */
1948EOAPI void efl_key_ref_set(Eo *obj, const char * key, const Efl_Object *objdata); 1945EO_API void efl_key_ref_set(Eo *obj, const char * key, const Efl_Object *objdata);
1949 1946
1950/** 1947/**
1951 * @brief Generic object reference with string key to object. 1948 * @brief Generic object reference with string key to object.
@@ -1961,7 +1958,7 @@ EOAPI void efl_key_ref_set(Eo *obj, const char * key, const Efl_Object *objdata)
1961 * 1958 *
1962 * @return The object to set 1959 * @return The object to set
1963 */ 1960 */
1964EOAPI Efl_Object *efl_key_ref_get(const Eo *obj, const char * key); 1961EO_API Efl_Object *efl_key_ref_get(const Eo *obj, const char * key);
1965 1962
1966/** 1963/**
1967 * @brief Generic weak object reference with string key to object. 1964 * @brief Generic weak object reference with string key to object.
@@ -1975,7 +1972,7 @@ EOAPI Efl_Object *efl_key_ref_get(const Eo *obj, const char * key);
1975 * @param[in] key The key associated with the object ref 1972 * @param[in] key The key associated with the object ref
1976 * @param[in] objdata The object to set 1973 * @param[in] objdata The object to set
1977 */ 1974 */
1978EOAPI void efl_key_wref_set(Eo *obj, const char * key, const Efl_Object *objdata); 1975EO_API void efl_key_wref_set(Eo *obj, const char * key, const Efl_Object *objdata);
1979 1976
1980/** 1977/**
1981 * @brief Generic weak object reference with string key to object. 1978 * @brief Generic weak object reference with string key to object.
@@ -1990,7 +1987,7 @@ EOAPI void efl_key_wref_set(Eo *obj, const char * key, const Efl_Object *objdata
1990 * 1987 *
1991 * @return The object to set 1988 * @return The object to set
1992 */ 1989 */
1993EOAPI Efl_Object *efl_key_wref_get(const Eo *obj, const char * key); 1990EO_API Efl_Object *efl_key_wref_get(const Eo *obj, const char * key);
1994 1991
1995/** 1992/**
1996 * @brief Value on with string key on the object. 1993 * @brief Value on with string key on the object.
@@ -2004,7 +2001,7 @@ EOAPI Efl_Object *efl_key_wref_get(const Eo *obj, const char * key);
2004 * @param[in] key The key associated with the value 2001 * @param[in] key The key associated with the value
2005 * @param[in] value The value to set 2002 * @param[in] value The value to set
2006 */ 2003 */
2007EOAPI void efl_key_value_set(Eo *obj, const char * key, Eina_Value *value); 2004EO_API void efl_key_value_set(Eo *obj, const char * key, Eina_Value *value);
2008 2005
2009/** 2006/**
2010 * @brief Value on with string key on the object. 2007 * @brief Value on with string key on the object.
@@ -2019,7 +2016,7 @@ EOAPI void efl_key_value_set(Eo *obj, const char * key, Eina_Value *value);
2019 * 2016 *
2020 * @return The value to set 2017 * @return The value to set
2021 */ 2018 */
2022EOAPI Eina_Value *efl_key_value_get(const Eo *obj, const char * key); 2019EO_API Eina_Value *efl_key_value_get(const Eo *obj, const char * key);
2023 2020
2024/** 2021/**
2025 * @brief Enable or disable the manual free feature. 2022 * @brief Enable or disable the manual free feature.
@@ -2036,7 +2033,7 @@ EOAPI Eina_Value *efl_key_value_get(const Eo *obj, const char * key);
2036 * 2033 *
2037 * @see efl_manual_free() 2034 * @see efl_manual_free()
2038 */ 2035 */
2039EAPI void efl_manual_free_set(Eo *obj, Eina_Bool manual_free); 2036EO_API void efl_manual_free_set(Eo *obj, Eina_Bool manual_free);
2040 2037
2041/** 2038/**
2042 * @brief Frees the object. 2039 * @brief Frees the object.
@@ -2049,7 +2046,7 @@ EAPI void efl_manual_free_set(Eo *obj, Eina_Bool manual_free);
2049 * 2046 *
2050 * @see efl_manual_free_set() 2047 * @see efl_manual_free_set()
2051 */ 2048 */
2052EAPI Eina_Bool efl_manual_free(Eo *obj); 2049EO_API Eina_Bool efl_manual_free(Eo *obj);
2053 2050
2054/** 2051/**
2055 * @brief Checks if the object was already descructed (only relevant for manual_free objects). 2052 * @brief Checks if the object was already descructed (only relevant for manual_free objects).
@@ -2060,7 +2057,7 @@ EAPI Eina_Bool efl_manual_free(Eo *obj);
2060 * 2057 *
2061 * @see efl_manual_free_set() 2058 * @see efl_manual_free_set()
2062 */ 2059 */
2063EAPI Eina_Bool efl_destructed_is(const Eo *obj); 2060EO_API Eina_Bool efl_destructed_is(const Eo *obj);
2064 2061
2065/** 2062/**
2066 * @brief Set the given #Eina_Value to the property with the specified \c property_name. 2063 * @brief Set the given #Eina_Value to the property with the specified \c property_name.
@@ -2070,7 +2067,7 @@ EAPI Eina_Bool efl_destructed_is(const Eo *obj);
2070 * 2067 *
2071 * @see efl_property_reflection_get() and efl_property_reflection_exist() 2068 * @see efl_property_reflection_get() and efl_property_reflection_exist()
2072 */ 2069 */
2073EAPI Eina_Error efl_property_reflection_set(Eo *obj, const char *property_name, Eina_Value value); 2070EO_API Eina_Error efl_property_reflection_set(Eo *obj, const char *property_name, Eina_Value value);
2074 2071
2075/** 2072/**
2076 * @brief Retrieve an #Eina_Value containing the current value of the property specified with \c property_name. 2073 * @brief Retrieve an #Eina_Value containing the current value of the property specified with \c property_name.
@@ -2081,7 +2078,7 @@ EAPI Eina_Error efl_property_reflection_set(Eo *obj, const char *property_name,
2081 * 2078 *
2082 * @see efl_property_reflection_set() and efl_property_reflection_exist() 2079 * @see efl_property_reflection_set() and efl_property_reflection_exist()
2083 */ 2080 */
2084EAPI Eina_Value efl_property_reflection_get(const Eo *obj, const char *property_name); 2081EO_API Eina_Value efl_property_reflection_get(const Eo *obj, const char *property_name);
2085 2082
2086/** 2083/**
2087 * @brief Check if a property exist for reflection. 2084 * @brief Check if a property exist for reflection.
@@ -2092,7 +2089,7 @@ EAPI Eina_Value efl_property_reflection_get(const Eo *obj, const char *property_
2092 * 2089 *
2093 * @see efl_property_reflection_set() and efl_property_reflection_get() 2090 * @see efl_property_reflection_set() and efl_property_reflection_get()
2094 */ 2091 */
2095EAPI Eina_Bool efl_property_reflection_exist(Eo *obj, const char *property_name); 2092EO_API Eina_Bool efl_property_reflection_exist(Eo *obj, const char *property_name);
2096 2093
2097/** 2094/**
2098 * @addtogroup Efl_Class_Class Eo's Class class. 2095 * @addtogroup Efl_Class_Class Eo's Class class.
@@ -2107,7 +2104,7 @@ EAPI Eina_Bool efl_property_reflection_exist(Eo *obj, const char *property_name)
2107 * 2104 *
2108 * @return The type of this class or INVALID if the klass parameter was invalid. 2105 * @return The type of this class or INVALID if the klass parameter was invalid.
2109 */ 2106 */
2110EAPI Efl_Class_Type efl_class_type_get(const Efl_Class *klass); 2107EO_API Efl_Class_Type efl_class_type_get(const Efl_Class *klass);
2111 2108
2112/** 2109/**
2113 * @} 2110 * @}
@@ -2174,7 +2171,7 @@ typedef void (*efl_key_data_free_func)(void *);
2174 * Helper for sorting callbacks array. Automatically used by 2171 * Helper for sorting callbacks array. Automatically used by
2175 * @ref EFL_CALLBACKS_ARRAY_DEFINE 2172 * @ref EFL_CALLBACKS_ARRAY_DEFINE
2176 */ 2173 */
2177EAPI int efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Item *b); 2174EO_API int efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Item *b);
2178 2175
2179/** 2176/**
2180 * Helper for creating global callback arrays. 2177 * Helper for creating global callback arrays.
@@ -2280,7 +2277,7 @@ EAPI int efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_
2280 * 2277 *
2281 * @ingroup Efl_Object 2278 * @ingroup Efl_Object
2282 */ 2279 */
2283EOAPI unsigned int efl_event_callback_count(const Eo *obj, const Efl_Event_Description *desc); 2280EO_API unsigned int efl_event_callback_count(const Eo *obj, const Efl_Event_Description *desc);
2284 2281
2285/** 2282/**
2286 * @brief Replace the previous Eo pointer with new content. 2283 * @brief Replace the previous Eo pointer with new content.
@@ -2314,7 +2311,7 @@ efl_replace(Eo **storage, const Eo *new_obj)
2314 return EINA_TRUE; 2311 return EINA_TRUE;
2315} 2312}
2316 2313
2317EOAPI extern const Eina_Value_Type *EINA_VALUE_TYPE_OBJECT; 2314EO_API extern const Eina_Value_Type *EINA_VALUE_TYPE_OBJECT;
2318 2315
2319/** 2316/**
2320 * @brief Create a new #Eina_Value containing the passed parameter. 2317 * @brief Create a new #Eina_Value containing the passed parameter.
@@ -2390,13 +2387,13 @@ efl_alive_get(const Eo *obj)
2390 * @brief Event triggered when a callback was added to the object 2387 * @brief Event triggered when a callback was added to the object
2391 */ 2388 */
2392#define EFL_EVENT_CALLBACK_ADD (&(_EFL_EVENT_CALLBACK_ADD)) 2389#define EFL_EVENT_CALLBACK_ADD (&(_EFL_EVENT_CALLBACK_ADD))
2393EAPI extern const Efl_Event_Description _EFL_EVENT_CALLBACK_ADD; 2390EO_API extern const Efl_Event_Description _EFL_EVENT_CALLBACK_ADD;
2394 2391
2395/** 2392/**
2396 * @brief Event triggered when a callback was removed from the object 2393 * @brief Event triggered when a callback was removed from the object
2397 */ 2394 */
2398#define EFL_EVENT_CALLBACK_DEL (&(_EFL_EVENT_CALLBACK_DEL)) 2395#define EFL_EVENT_CALLBACK_DEL (&(_EFL_EVENT_CALLBACK_DEL))
2399EAPI extern const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL; 2396EO_API extern const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL;
2400 2397
2401/** 2398/**
2402 * @} 2399 * @}
@@ -2414,7 +2411,7 @@ EAPI extern const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL;
2414 * 2411 *
2415 * @return an iterator on success, NULL otherwise 2412 * @return an iterator on success, NULL otherwise
2416 */ 2413 */
2417EAPI Eina_Iterator *eo_classes_iterator_new(void); 2414EO_API Eina_Iterator *eo_classes_iterator_new(void);
2418 2415
2419/** 2416/**
2420 * @brief Get an iterator on the Eo objects 2417 * @brief Get an iterator on the Eo objects
@@ -2423,7 +2420,7 @@ EAPI Eina_Iterator *eo_classes_iterator_new(void);
2423 * 2420 *
2424 * @return an iterator on success, NULL otherwise 2421 * @return an iterator on success, NULL otherwise
2425 */ 2422 */
2426EAPI Eina_Iterator *eo_objects_iterator_new(void); 2423EO_API Eina_Iterator *eo_objects_iterator_new(void);
2427 2424
2428/** 2425/**
2429 * @brief Check if a object can be owned 2426 * @brief Check if a object can be owned
@@ -2433,7 +2430,7 @@ EAPI Eina_Iterator *eo_objects_iterator_new(void);
2433 * 2430 *
2434 * @return EINA_TRUE if the object is ownable. EINA_FALSE if not. 2431 * @return EINA_TRUE if the object is ownable. EINA_FALSE if not.
2435 */ 2432 */
2436EAPI Eina_Bool efl_ownable_get(const Eo *obj); 2433EO_API Eina_Bool efl_ownable_get(const Eo *obj);
2437 2434
2438/** 2435/**
2439 * @} 2436 * @}
@@ -2448,10 +2445,4 @@ EAPI Eina_Bool efl_ownable_get(const Eo *obj);
2448} 2445}
2449#endif 2446#endif
2450 2447
2451#undef EAPI
2452#define EAPI
2453
2454#undef EOAPI
2455#define EOAPI
2456
2457#endif 2448#endif
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 1b9cdd9c9a..b7f10faad8 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -38,8 +38,8 @@ static Eina_Bool _eo_trash_bypass = EINA_FALSE;
38#define EFL_OBJECT_OP_IDS_FIRST 1 38#define EFL_OBJECT_OP_IDS_FIRST 1
39 39
40/* Used inside the class_get functions of classes, see #EFL_DEFINE_CLASS */ 40/* Used inside the class_get functions of classes, see #EFL_DEFINE_CLASS */
41EAPI Eina_Lock _efl_class_creation_lock; 41EO_API Eina_Lock _efl_class_creation_lock;
42EAPI unsigned int _efl_object_init_generation = 1; 42EO_API unsigned int _efl_object_init_generation = 1;
43int _eo_log_dom = -1; 43int _eo_log_dom = -1;
44Eina_Thread _efl_object_main_thread; 44Eina_Thread _efl_object_main_thread;
45static unsigned int efl_del_api_generation = 0; 45static unsigned int efl_del_api_generation = 0;
@@ -524,19 +524,19 @@ err_obj_hierarchy:
524 return NULL; 524 return NULL;
525} 525}
526 526
527EAPI Eo * 527EO_API Eo *
528efl_super(const Eo *eo_id, const Efl_Class *cur_klass) 528efl_super(const Eo *eo_id, const Efl_Class *cur_klass)
529{ 529{
530 return _efl_super_cast(eo_id, cur_klass, EINA_TRUE); 530 return _efl_super_cast(eo_id, cur_klass, EINA_TRUE);
531} 531}
532 532
533EAPI Eo * 533EO_API Eo *
534efl_cast(const Eo *eo_id, const Efl_Class *cur_klass) 534efl_cast(const Eo *eo_id, const Efl_Class *cur_klass)
535{ 535{
536 return _efl_super_cast(eo_id, cur_klass, EINA_FALSE); 536 return _efl_super_cast(eo_id, cur_klass, EINA_FALSE);
537} 537}
538 538
539EAPI Eina_Bool 539EO_API Eina_Bool
540_efl_object_call_resolve(Eo *eo_id, const char *func_name, Efl_Object_Op_Call_Data *call, Efl_Object_Op op, const char *file, int line) 540_efl_object_call_resolve(Eo *eo_id, const char *func_name, Efl_Object_Op_Call_Data *call, Efl_Object_Op op, const char *file, int line)
541{ 541{
542 const _Efl_Class *klass, *main_klass; 542 const _Efl_Class *klass, *main_klass;
@@ -692,7 +692,7 @@ on_null:
692 return EINA_FALSE; 692 return EINA_FALSE;
693} 693}
694 694
695EAPI void 695EO_API void
696_efl_object_call_end(Efl_Object_Op_Call_Data *call) 696_efl_object_call_end(Efl_Object_Op_Call_Data *call)
697{ 697{
698 if (EINA_LIKELY(!!call->obj)) 698 if (EINA_LIKELY(!!call->obj))
@@ -735,7 +735,7 @@ _efl_object_api_op_id_get_internal(const void *api_func)
735} 735}
736 736
737/* LEGACY, should be removed before next release */ 737/* LEGACY, should be removed before next release */
738EAPI Efl_Object_Op 738EO_API Efl_Object_Op
739_efl_object_api_op_id_get(const void *api_func) 739_efl_object_api_op_id_get(const void *api_func)
740{ 740{
741 Efl_Object_Op op = _efl_object_api_op_id_get_internal(api_func); 741 Efl_Object_Op op = _efl_object_api_op_id_get_internal(api_func);
@@ -748,7 +748,7 @@ _efl_object_api_op_id_get(const void *api_func)
748 return op; 748 return op;
749} 749}
750 750
751EAPI Efl_Object_Op 751EO_API Efl_Object_Op
752_efl_object_op_api_id_get(const void *api_func, const Eo *eo_obj, const char *api_func_name, const char *file, int line) 752_efl_object_op_api_id_get(const void *api_func, const Eo *eo_obj, const char *api_func_name, const char *file, int line)
753{ 753{
754 Efl_Object_Op op; 754 Efl_Object_Op op;
@@ -886,7 +886,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Cla
886 return EINA_TRUE; 886 return EINA_TRUE;
887} 887}
888 888
889EAPI Eina_Bool 889EO_API Eina_Bool
890efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Property_Reflection_Ops *reflection_table) 890efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Property_Reflection_Ops *reflection_table)
891{ 891{
892 EO_CLASS_POINTER_GOTO(klass_id, klass, err_klass); 892 EO_CLASS_POINTER_GOTO(klass_id, klass, err_klass);
@@ -1092,13 +1092,13 @@ err_parent:
1092 return NULL; 1092 return NULL;
1093} 1093}
1094 1094
1095EAPI Eo * 1095EO_API Eo *
1096_efl_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback) 1096_efl_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback)
1097{ 1097{
1098 return _efl_add_internal_start_do(file, line, klass_id, parent_id, ref, is_fallback, NULL, NULL); 1098 return _efl_add_internal_start_do(file, line, klass_id, parent_id, ref, is_fallback, NULL, NULL);
1099} 1099}
1100 1100
1101EAPI Eo * _efl_add_internal_start_bindings(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback, Efl_Substitute_Ctor_Cb substitute_ctor, void *sub_ctor_data) 1101EO_API Eo * _efl_add_internal_start_bindings(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback, Efl_Substitute_Ctor_Cb substitute_ctor, void *sub_ctor_data)
1102{ 1102{
1103 return _efl_add_internal_start_do(file, line, klass_id, parent_id, ref, is_fallback, substitute_ctor, sub_ctor_data); 1103 return _efl_add_internal_start_do(file, line, klass_id, parent_id, ref, is_fallback, substitute_ctor, sub_ctor_data);
1104} 1104}
@@ -1145,7 +1145,7 @@ cleanup:
1145 return NULL; 1145 return NULL;
1146} 1146}
1147 1147
1148EAPI Eo * 1148EO_API Eo *
1149_efl_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback) 1149_efl_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback)
1150{ 1150{
1151 if (!eo_id) return NULL; 1151 if (!eo_id) return NULL;
@@ -1165,7 +1165,7 @@ _efl_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback)
1165 return ret; 1165 return ret;
1166} 1166}
1167 1167
1168EAPI void 1168EO_API void
1169efl_reuse(const Eo *eo_id) 1169efl_reuse(const Eo *eo_id)
1170{ 1170{
1171 Eo *obj = (Eo *) eo_id; 1171 Eo *obj = (Eo *) eo_id;
@@ -1248,7 +1248,7 @@ _eo_free(_Eo_Object *obj, Eina_Bool manual_free EINA_UNUSED)
1248} 1248}
1249/*****************************************************************************/ 1249/*****************************************************************************/
1250 1250
1251EAPI const Efl_Class * 1251EO_API const Efl_Class *
1252efl_class_get(const Eo *eo_id) 1252efl_class_get(const Eo *eo_id)
1253{ 1253{
1254 const Efl_Class *klass; 1254 const Efl_Class *klass;
@@ -1270,7 +1270,7 @@ err_obj:
1270 return NULL; 1270 return NULL;
1271} 1271}
1272 1272
1273EAPI const char * 1273EO_API const char *
1274efl_class_name_get(const Efl_Class *eo_id) 1274efl_class_name_get(const Efl_Class *eo_id)
1275{ 1275{
1276 const _Efl_Class *klass; 1276 const _Efl_Class *klass;
@@ -1294,7 +1294,7 @@ err_obj:
1294 return NULL; 1294 return NULL;
1295} 1295}
1296 1296
1297EAPI size_t 1297EO_API size_t
1298efl_class_memory_size_get(const Efl_Class *eo_id) 1298efl_class_memory_size_get(const Efl_Class *eo_id)
1299{ 1299{
1300 const _Efl_Class *klass; 1300 const _Efl_Class *klass;
@@ -1561,7 +1561,7 @@ _eo_classes_expand(void)
1561 _eo_classes = (_Efl_Class **)ptr; 1561 _eo_classes = (_Efl_Class **)ptr;
1562} 1562}
1563 1563
1564EAPI const Efl_Class * 1564EO_API const Efl_Class *
1565efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...) 1565efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
1566{ 1566{
1567 _Efl_Class *klass; 1567 _Efl_Class *klass;
@@ -1807,7 +1807,7 @@ efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...
1807 return _eo_class_id_get(klass); 1807 return _eo_class_id_get(klass);
1808} 1808}
1809 1809
1810EAPI Eina_Bool 1810EO_API Eina_Bool
1811efl_object_override(Eo *eo_id, const Efl_Object_Ops *ops) 1811efl_object_override(Eo *eo_id, const Efl_Object_Ops *ops)
1812{ 1812{
1813 EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE); 1813 EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE);
@@ -1864,7 +1864,7 @@ err:
1864 return EINA_FALSE; 1864 return EINA_FALSE;
1865} 1865}
1866 1866
1867EAPI Eina_Bool 1867EO_API Eina_Bool
1868efl_isa(const Eo *eo_id, const Efl_Class *klass_id) 1868efl_isa(const Eo *eo_id, const Efl_Class *klass_id)
1869{ 1869{
1870 Efl_Id_Domain domain; 1870 Efl_Id_Domain domain;
@@ -1979,7 +1979,7 @@ err: EINA_COLD
1979 return EINA_FALSE; 1979 return EINA_FALSE;
1980} 1980}
1981 1981
1982EAPI Eo * 1982EO_API Eo *
1983efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id) 1983efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id)
1984{ 1984{
1985 efl_ref(obj_id); 1985 efl_ref(obj_id);
@@ -2004,7 +2004,7 @@ efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id)
2004 return obj_id; 2004 return obj_id;
2005} 2005}
2006 2006
2007EAPI void 2007EO_API void
2008efl_xunref(Eo *obj_id, const Eo *ref_obj_id) 2008efl_xunref(Eo *obj_id, const Eo *ref_obj_id)
2009{ 2009{
2010 EO_OBJ_POINTER_RETURN(obj_id, obj); 2010 EO_OBJ_POINTER_RETURN(obj_id, obj);
@@ -2034,7 +2034,7 @@ efl_xunref(Eo *obj_id, const Eo *ref_obj_id)
2034 efl_unref(obj_id); 2034 efl_unref(obj_id);
2035} 2035}
2036 2036
2037EAPI Eo * 2037EO_API Eo *
2038efl_ref(const Eo *obj_id) 2038efl_ref(const Eo *obj_id)
2039{ 2039{
2040 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, (Eo *)obj_id); 2040 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, (Eo *)obj_id);
@@ -2052,7 +2052,7 @@ efl_ref(const Eo *obj_id)
2052 return (Eo *)obj_id; 2052 return (Eo *)obj_id;
2053} 2053}
2054 2054
2055EAPI void 2055EO_API void
2056efl_unref(const Eo *obj_id) 2056efl_unref(const Eo *obj_id)
2057{ 2057{
2058 EO_OBJ_POINTER_RETURN(obj_id, obj); 2058 EO_OBJ_POINTER_RETURN(obj_id, obj);
@@ -2114,7 +2114,7 @@ efl_unref(const Eo *obj_id)
2114 EO_OBJ_DONE(obj_id); 2114 EO_OBJ_DONE(obj_id);
2115} 2115}
2116 2116
2117EAPI int 2117EO_API int
2118efl_ref_count(const Eo *obj_id) 2118efl_ref_count(const Eo *obj_id)
2119{ 2119{
2120 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, 0); 2120 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, 0);
@@ -2124,7 +2124,7 @@ efl_ref_count(const Eo *obj_id)
2124 return ref; 2124 return ref;
2125} 2125}
2126 2126
2127EAPI int 2127EO_API int
2128___efl_ref2_count(const Eo *obj_id) 2128___efl_ref2_count(const Eo *obj_id)
2129{ 2129{
2130 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, 0); 2130 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, 0);
@@ -2134,7 +2134,7 @@ ___efl_ref2_count(const Eo *obj_id)
2134 return ref; 2134 return ref;
2135} 2135}
2136 2136
2137EAPI void 2137EO_API void
2138___efl_ref2_reset(const Eo *obj_id) 2138___efl_ref2_reset(const Eo *obj_id)
2139{ 2139{
2140 EO_OBJ_POINTER_RETURN(obj_id, obj); 2140 EO_OBJ_POINTER_RETURN(obj_id, obj);
@@ -2143,7 +2143,7 @@ ___efl_ref2_reset(const Eo *obj_id)
2143} 2143}
2144 2144
2145 2145
2146EAPI void 2146EO_API void
2147efl_del_intercept_set(Eo *obj_id, Efl_Del_Intercept del_intercept_func) 2147efl_del_intercept_set(Eo *obj_id, Efl_Del_Intercept del_intercept_func)
2148{ 2148{
2149 EO_OBJ_POINTER_RETURN(obj_id, obj); 2149 EO_OBJ_POINTER_RETURN(obj_id, obj);
@@ -2151,7 +2151,7 @@ efl_del_intercept_set(Eo *obj_id, Efl_Del_Intercept del_intercept_func)
2151 EO_OBJ_DONE(obj_id); 2151 EO_OBJ_DONE(obj_id);
2152} 2152}
2153 2153
2154EAPI Efl_Del_Intercept 2154EO_API Efl_Del_Intercept
2155efl_del_intercept_get(const Eo *obj_id) 2155efl_del_intercept_get(const Eo *obj_id)
2156{ 2156{
2157 Efl_Del_Intercept func; 2157 Efl_Del_Intercept func;
@@ -2282,7 +2282,7 @@ _efl_data_xunref_internal(_Eo_Object *obj EINA_UNUSED, void *data EINA_UNUSED, c
2282#endif 2282#endif
2283} 2283}
2284 2284
2285EAPI void * 2285EO_API void *
2286efl_data_scope_get(const Eo *obj_id, const Efl_Class *klass_id) 2286efl_data_scope_get(const Eo *obj_id, const Efl_Class *klass_id)
2287{ 2287{
2288 void *ret = NULL; 2288 void *ret = NULL;
@@ -2310,7 +2310,7 @@ err_klass:
2310 return ret; 2310 return ret;
2311} 2311}
2312 2312
2313EAPI void * 2313EO_API void *
2314efl_data_scope_safe_get(const Eo *obj_id, const Efl_Class *klass_id) 2314efl_data_scope_safe_get(const Eo *obj_id, const Efl_Class *klass_id)
2315{ 2315{
2316 void *ret = NULL; 2316 void *ret = NULL;
@@ -2335,7 +2335,7 @@ err_klass:
2335 return ret; 2335 return ret;
2336} 2336}
2337 2337
2338EAPI void * 2338EO_API void *
2339efl_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_Class *klass_id, const Eo *ref_obj_id) 2339efl_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_Class *klass_id, const Eo *ref_obj_id)
2340{ 2340{
2341 void *ret = NULL; 2341 void *ret = NULL;
@@ -2378,7 +2378,7 @@ err:
2378#endif 2378#endif
2379} 2379}
2380 2380
2381EAPI void 2381EO_API void
2382efl_data_xunref_internal(const Eo *obj_id, void *data, const Eo *ref_obj_id) 2382efl_data_xunref_internal(const Eo *obj_id, void *data, const Eo *ref_obj_id)
2383{ 2383{
2384 EO_OBJ_POINTER_RETURN(obj_id, obj); 2384 EO_OBJ_POINTER_RETURN(obj_id, obj);
@@ -2403,7 +2403,7 @@ _eo_table_del_cb(void *in)
2403 * This is used by the gdb debug helper script */ 2403 * This is used by the gdb debug helper script */
2404Eo_Id_Data *_eo_gdb_main_domain = NULL; 2404Eo_Id_Data *_eo_gdb_main_domain = NULL;
2405 2405
2406EAPI Eina_Bool 2406EO_API Eina_Bool
2407efl_object_init(void) 2407efl_object_init(void)
2408{ 2408{
2409 const char *log_dom = "eo"; 2409 const char *log_dom = "eo";
@@ -2498,7 +2498,7 @@ efl_object_init(void)
2498 return efl_klass && efl_object; 2498 return efl_klass && efl_object;
2499} 2499}
2500 2500
2501EAPI Eina_Bool 2501EO_API Eina_Bool
2502efl_object_shutdown(void) 2502efl_object_shutdown(void)
2503{ 2503{
2504 size_t i; 2504 size_t i;
@@ -2569,21 +2569,21 @@ efl_object_shutdown(void)
2569} 2569}
2570 2570
2571 2571
2572EAPI Efl_Id_Domain 2572EO_API Efl_Id_Domain
2573efl_domain_get(void) 2573efl_domain_get(void)
2574{ 2574{
2575 Eo_Id_Data *data = _eo_table_data_get(); 2575 Eo_Id_Data *data = _eo_table_data_get();
2576 return data->local_domain; 2576 return data->local_domain;
2577} 2577}
2578 2578
2579EAPI Efl_Id_Domain 2579EO_API Efl_Id_Domain
2580efl_domain_current_get(void) 2580efl_domain_current_get(void)
2581{ 2581{
2582 Eo_Id_Data *data = _eo_table_data_get(); 2582 Eo_Id_Data *data = _eo_table_data_get();
2583 return data->domain_stack[data->stack_top]; 2583 return data->domain_stack[data->stack_top];
2584} 2584}
2585 2585
2586EAPI Eina_Bool 2586EO_API Eina_Bool
2587efl_domain_switch(Efl_Id_Domain domain) 2587efl_domain_switch(Efl_Id_Domain domain)
2588{ 2588{
2589 Eo_Id_Data *data = _eo_table_data_get(); 2589 Eo_Id_Data *data = _eo_table_data_get();
@@ -2630,21 +2630,21 @@ _efl_domain_pop(Eo_Id_Data *data)
2630 if (data->stack_top > 0) data->stack_top--; 2630 if (data->stack_top > 0) data->stack_top--;
2631} 2631}
2632 2632
2633EAPI Eina_Bool 2633EO_API Eina_Bool
2634efl_domain_current_push(Efl_Id_Domain domain) 2634efl_domain_current_push(Efl_Id_Domain domain)
2635{ 2635{
2636 Eo_Id_Data *data = _eo_table_data_get(); 2636 Eo_Id_Data *data = _eo_table_data_get();
2637 return _efl_domain_push(data, domain); 2637 return _efl_domain_push(data, domain);
2638} 2638}
2639 2639
2640EAPI void 2640EO_API void
2641efl_domain_current_pop(void) 2641efl_domain_current_pop(void)
2642{ 2642{
2643 Eo_Id_Data *data = _eo_table_data_get(); 2643 Eo_Id_Data *data = _eo_table_data_get();
2644 _efl_domain_pop(data); 2644 _efl_domain_pop(data);
2645} 2645}
2646 2646
2647EAPI Eina_Bool 2647EO_API Eina_Bool
2648efl_domain_current_set(Efl_Id_Domain domain) 2648efl_domain_current_set(Efl_Id_Domain domain)
2649{ 2649{
2650 Eo_Id_Data *data = _eo_table_data_get(); 2650 Eo_Id_Data *data = _eo_table_data_get();
@@ -2657,14 +2657,14 @@ efl_domain_current_set(Efl_Id_Domain domain)
2657 return EINA_TRUE; 2657 return EINA_TRUE;
2658} 2658}
2659 2659
2660EAPI Efl_Domain_Data * 2660EO_API Efl_Domain_Data *
2661efl_domain_data_get(void) 2661efl_domain_data_get(void)
2662{ 2662{
2663 Eo_Id_Data *data = _eo_table_data_get(); 2663 Eo_Id_Data *data = _eo_table_data_get();
2664 return (Efl_Domain_Data *)data; 2664 return (Efl_Domain_Data *)data;
2665} 2665}
2666 2666
2667EAPI Efl_Id_Domain 2667EO_API Efl_Id_Domain
2668efl_domain_data_adopt(Efl_Domain_Data *data_in) 2668efl_domain_data_adopt(Efl_Domain_Data *data_in)
2669{ 2669{
2670 Eo_Id_Data *data = _eo_table_data_get(); 2670 Eo_Id_Data *data = _eo_table_data_get();
@@ -2692,7 +2692,7 @@ efl_domain_data_adopt(Efl_Domain_Data *data_in)
2692 return data->domain_stack[data->stack_top]; 2692 return data->domain_stack[data->stack_top];
2693} 2693}
2694 2694
2695EAPI Eina_Bool 2695EO_API Eina_Bool
2696efl_domain_data_return(Efl_Id_Domain domain) 2696efl_domain_data_return(Efl_Id_Domain domain)
2697{ 2697{
2698 Eo_Id_Data *data = _eo_table_data_get(); 2698 Eo_Id_Data *data = _eo_table_data_get();
@@ -2712,7 +2712,7 @@ efl_domain_data_return(Efl_Id_Domain domain)
2712 return EINA_TRUE; 2712 return EINA_TRUE;
2713} 2713}
2714 2714
2715EAPI Eina_Bool 2715EO_API Eina_Bool
2716efl_compatible(const Eo *obj, const Eo *obj_target) 2716efl_compatible(const Eo *obj, const Eo *obj_target)
2717{ 2717{
2718 Efl_Id_Domain domain1 = ((Eo_Id)obj >> SHIFT_DOMAIN) & MASK_DOMAIN; 2718 Efl_Id_Domain domain1 = ((Eo_Id)obj >> SHIFT_DOMAIN) & MASK_DOMAIN;
@@ -2723,7 +2723,7 @@ efl_compatible(const Eo *obj, const Eo *obj_target)
2723 return EINA_FALSE; 2723 return EINA_FALSE;
2724} 2724}
2725 2725
2726EAPI Eina_Bool 2726EO_API Eina_Bool
2727efl_class_override_register(const Efl_Class *klass, const Efl_Class *override) 2727efl_class_override_register(const Efl_Class *klass, const Efl_Class *override)
2728{ 2728{
2729 EINA_SAFETY_ON_NULL_RETURN_VAL(klass, EINA_FALSE); 2729 EINA_SAFETY_ON_NULL_RETURN_VAL(klass, EINA_FALSE);
@@ -2737,7 +2737,7 @@ efl_class_override_register(const Efl_Class *klass, const Efl_Class *override)
2737 return EINA_TRUE; 2737 return EINA_TRUE;
2738} 2738}
2739 2739
2740EAPI Eina_Bool 2740EO_API Eina_Bool
2741efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override) 2741efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override)
2742{ 2742{
2743 const Efl_Class *set; 2743 const Efl_Class *set;
@@ -2750,7 +2750,7 @@ efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override)
2750 return eina_hash_del_by_key(class_overrides, &klass); 2750 return eina_hash_del_by_key(class_overrides, &klass);
2751} 2751}
2752 2752
2753EAPI Eina_Bool 2753EO_API Eina_Bool
2754efl_destructed_is(const Eo *obj_id) 2754efl_destructed_is(const Eo *obj_id)
2755{ 2755{
2756 Eina_Bool is; 2756 Eina_Bool is;
@@ -2760,7 +2760,7 @@ efl_destructed_is(const Eo *obj_id)
2760 return is; 2760 return is;
2761} 2761}
2762 2762
2763EAPI void 2763EO_API void
2764efl_manual_free_set(Eo *obj_id, Eina_Bool manual_free) 2764efl_manual_free_set(Eo *obj_id, Eina_Bool manual_free)
2765{ 2765{
2766 EO_OBJ_POINTER_RETURN(obj_id, obj); 2766 EO_OBJ_POINTER_RETURN(obj_id, obj);
@@ -2768,7 +2768,7 @@ efl_manual_free_set(Eo *obj_id, Eina_Bool manual_free)
2768 EO_OBJ_DONE(obj_id); 2768 EO_OBJ_DONE(obj_id);
2769} 2769}
2770 2770
2771EAPI Eina_Bool 2771EO_API Eina_Bool
2772efl_manual_free(Eo *obj_id) 2772efl_manual_free(Eo *obj_id)
2773{ 2773{
2774 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE); 2774 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE);
@@ -2792,7 +2792,7 @@ err:
2792 return EINA_FALSE; 2792 return EINA_FALSE;
2793} 2793}
2794 2794
2795EAPI const char * 2795EO_API const char *
2796efl_debug_name_get(const Eo *obj_id) 2796efl_debug_name_get(const Eo *obj_id)
2797{ 2797{
2798 const char *override = ""; 2798 const char *override = "";
@@ -2852,7 +2852,7 @@ efl_debug_name_get(const Eo *obj_id)
2852 return eina_slstr_strbuf_new(sb); 2852 return eina_slstr_strbuf_new(sb);
2853} 2853}
2854 2854
2855EAPI int 2855EO_API int
2856efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Item *b) 2856efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Item *b)
2857{ 2857{
2858 if (a->desc == b->desc) return 0; 2858 if (a->desc == b->desc) return 0;
@@ -2982,7 +2982,7 @@ _eo_log_obj_entry_show(const Eo_Log_Obj_Entry *entry, int log_level, const char
2982 entry->timestamp - _eo_log_time_start, now - entry->timestamp, 2982 entry->timestamp - _eo_log_time_start, now - entry->timestamp,
2983 entry->bt_hits); 2983 entry->bt_hits);
2984 2984
2985 // Skip EAPI and _eo_log_obj_ref_op() 2985 // Skip EO_API and _eo_log_obj_ref_op()
2986 for (i = 2; i < entry->bt_size; i++) 2986 for (i = 2; i < entry->bt_size; i++)
2987 { 2987 {
2988#ifdef HAVE_DLADDR 2988#ifdef HAVE_DLADDR
@@ -3525,7 +3525,7 @@ _eo_classes_iterator_free(Eina_Iterator *it)
3525 free(it); 3525 free(it);
3526} 3526}
3527 3527
3528EAPI Eina_Iterator * 3528EO_API Eina_Iterator *
3529eo_classes_iterator_new(void) 3529eo_classes_iterator_new(void)
3530{ 3530{
3531 _Eo_Classes_Iterator *it; 3531 _Eo_Classes_Iterator *it;
@@ -3602,7 +3602,7 @@ _eo_objects_iterator_free(Eina_Iterator *it)
3602 free(it); 3602 free(it);
3603} 3603}
3604 3604
3605EAPI Eina_Iterator * 3605EO_API Eina_Iterator *
3606eo_objects_iterator_new(void) 3606eo_objects_iterator_new(void)
3607{ 3607{
3608 _Eo_Objects_Iterator *it; 3608 _Eo_Objects_Iterator *it;
@@ -3717,7 +3717,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_OBJECT = {
3717 .pget = _eo_value_pget 3717 .pget = _eo_value_pget
3718}; 3718};
3719 3719
3720EOAPI const Eina_Value_Type *EINA_VALUE_TYPE_OBJECT = &_EINA_VALUE_TYPE_OBJECT; 3720EO_API const Eina_Value_Type *EINA_VALUE_TYPE_OBJECT = &_EINA_VALUE_TYPE_OBJECT;
3721 3721
3722static const Efl_Object_Property_Reflection* 3722static const Efl_Object_Property_Reflection*
3723_efl_class_reflection_find(const _Efl_Class *klass, const char *property_name) 3723_efl_class_reflection_find(const _Efl_Class *klass, const char *property_name)
@@ -3751,7 +3751,7 @@ _efl_class_reflection_find(const _Efl_Class *klass, const char *property_name)
3751 return NULL; 3751 return NULL;
3752} 3752}
3753 3753
3754EAPI Eina_Error 3754EO_API Eina_Error
3755efl_property_reflection_set(Eo *obj_id, const char *property_name, Eina_Value value) 3755efl_property_reflection_set(Eo *obj_id, const char *property_name, Eina_Value value)
3756{ 3756{
3757 Eina_Error r = EINA_ERROR_NOT_IMPLEMENTED; 3757 Eina_Error r = EINA_ERROR_NOT_IMPLEMENTED;
@@ -3772,7 +3772,7 @@ efl_property_reflection_set(Eo *obj_id, const char *property_name, Eina_Value va
3772 return r; 3772 return r;
3773} 3773}
3774 3774
3775EAPI Eina_Value 3775EO_API Eina_Value
3776efl_property_reflection_get(const Eo *obj_id, const char *property_name) 3776efl_property_reflection_get(const Eo *obj_id, const char *property_name)
3777{ 3777{
3778 Eina_Value r = eina_value_error_init(EINA_ERROR_NOT_IMPLEMENTED); 3778 Eina_Value r = eina_value_error_init(EINA_ERROR_NOT_IMPLEMENTED);
@@ -3789,7 +3789,7 @@ efl_property_reflection_get(const Eo *obj_id, const char *property_name)
3789 return r; 3789 return r;
3790} 3790}
3791 3791
3792EAPI Eina_Bool 3792EO_API Eina_Bool
3793efl_property_reflection_exist(Eo *obj_id, const char *property_name) 3793efl_property_reflection_exist(Eo *obj_id, const char *property_name)
3794{ 3794{
3795 Eina_Bool r = EINA_FALSE; 3795 Eina_Bool r = EINA_FALSE;
@@ -3802,7 +3802,7 @@ efl_property_reflection_exist(Eo *obj_id, const char *property_name)
3802 return r; 3802 return r;
3803} 3803}
3804 3804
3805EAPI Efl_Class_Type 3805EO_API Efl_Class_Type
3806efl_class_type_get(const Efl_Class *klass_id) 3806efl_class_type_get(const Efl_Class *klass_id)
3807{ 3807{
3808 EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, EFL_CLASS_TYPE_INVALID); 3808 EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, EFL_CLASS_TYPE_INVALID);
@@ -3811,7 +3811,7 @@ efl_class_type_get(const Efl_Class *klass_id)
3811} 3811}
3812 3812
3813 3813
3814EAPI Eina_Bool 3814EO_API Eina_Bool
3815efl_ownable_get(const Eo *obj) 3815efl_ownable_get(const Eo *obj)
3816{ 3816{
3817 int ref = efl_ref_count(obj); 3817 int ref = efl_ref_count(obj);
diff --git a/src/lib/eo/eo_add_fallback.c b/src/lib/eo/eo_add_fallback.c
index f3a82f25d6..f349b336b4 100644
--- a/src/lib/eo/eo_add_fallback.c
+++ b/src/lib/eo/eo_add_fallback.c
@@ -130,7 +130,7 @@ _eo_call_stack_get_thread(void)
130 return stack; 130 return stack;
131} 131}
132 132
133EAPI Eo * 133EO_API Eo *
134_efl_added_get(void) 134_efl_added_get(void)
135{ 135{
136 return _EFL_OBJECT_CALL_STACK_GET()->frame_ptr->obj; 136 return _EFL_OBJECT_CALL_STACK_GET()->frame_ptr->obj;
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index e7445021bd..c062833188 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -13,10 +13,10 @@
13#include "eo_private.h" 13#include "eo_private.h"
14#include "eina_promise_private.h" 14#include "eina_promise_private.h"
15 15
16EAPI const Efl_Event_Description _EFL_EVENT_CALLBACK_ADD = 16EO_API const Efl_Event_Description _EFL_EVENT_CALLBACK_ADD =
17 EFL_EVENT_DESCRIPTION_HOT("callback,add"); 17 EFL_EVENT_DESCRIPTION_HOT("callback,add");
18 18
19EAPI const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL = 19EO_API const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL =
20 EFL_EVENT_DESCRIPTION_HOT("callback,del"); 20 EFL_EVENT_DESCRIPTION_HOT("callback,del");
21 21
22static int event_freeze_count = 0; 22static int event_freeze_count = 0;
@@ -423,7 +423,7 @@ _efl_object_key_data_set(Eo *obj, Efl_Object_Data *pd, const char *key, const vo
423 _key_generic_set(obj, pd, key, data, DATA_PTR, EINA_TRUE); 423 _key_generic_set(obj, pd, key, data, DATA_PTR, EINA_TRUE);
424} 424}
425 425
426EOAPI EFL_VOID_FUNC_BODYV(efl_key_data_set, EFL_FUNC_CALL(key, data), 426EO_API EFL_VOID_FUNC_BODYV(efl_key_data_set, EFL_FUNC_CALL(key, data),
427 const char *key, const void *data); 427 const char *key, const void *data);
428 428
429EOLIAN static void * 429EOLIAN static void *
@@ -432,7 +432,7 @@ _efl_object_key_data_get(Eo *obj, Efl_Object_Data *pd, const char *key)
432 return _key_generic_get(obj, pd, key, DATA_PTR); 432 return _key_generic_get(obj, pd, key, DATA_PTR);
433} 433}
434 434
435EOAPI EFL_FUNC_BODYV_CONST(efl_key_data_get, void *, NULL, EFL_FUNC_CALL(key), 435EO_API EFL_FUNC_BODYV_CONST(efl_key_data_get, void *, NULL, EFL_FUNC_CALL(key),
436 const char *key); 436 const char *key);
437 437
438EOLIAN static void 438EOLIAN static void
@@ -449,7 +449,7 @@ _efl_object_key_ref_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *ke
449 } 449 }
450} 450}
451 451
452EOAPI EFL_VOID_FUNC_BODYV(efl_key_ref_set, EFL_FUNC_CALL(key, objdata), 452EO_API EFL_VOID_FUNC_BODYV(efl_key_ref_set, EFL_FUNC_CALL(key, objdata),
453 const char *key, const Efl_Object *objdata); 453 const char *key, const Efl_Object *objdata);
454 454
455EOLIAN static Eo * 455EOLIAN static Eo *
@@ -458,7 +458,7 @@ _efl_object_key_ref_get(Eo *obj, Efl_Object_Data *pd, const char *key)
458 return _key_generic_get(obj, pd, key, DATA_OBJ); 458 return _key_generic_get(obj, pd, key, DATA_OBJ);
459} 459}
460 460
461EOAPI EFL_FUNC_BODYV_CONST(efl_key_ref_get, Efl_Object *, NULL, 461EO_API EFL_FUNC_BODYV_CONST(efl_key_ref_get, Efl_Object *, NULL,
462 EFL_FUNC_CALL(key), const char *key); 462 EFL_FUNC_CALL(key), const char *key);
463 463
464EOLIAN static void 464EOLIAN static void
@@ -474,7 +474,7 @@ _efl_object_key_wref_set(Eo *obj, Efl_Object_Data *pd, const char * key, const E
474 } 474 }
475} 475}
476 476
477EOAPI EFL_VOID_FUNC_BODYV(efl_key_wref_set, EFL_FUNC_CALL(key, objdata), 477EO_API EFL_VOID_FUNC_BODYV(efl_key_wref_set, EFL_FUNC_CALL(key, objdata),
478 const char *key, const Efl_Object *objdata); 478 const char *key, const Efl_Object *objdata);
479 479
480EOLIAN static Eo * 480EOLIAN static Eo *
@@ -483,7 +483,7 @@ _efl_object_key_wref_get(Eo *obj, Efl_Object_Data *pd, const char * key)
483 return _key_generic_get(obj, pd, key, DATA_OBJ_WEAK); 483 return _key_generic_get(obj, pd, key, DATA_OBJ_WEAK);
484} 484}
485 485
486EOAPI EFL_FUNC_BODYV_CONST(efl_key_wref_get, Efl_Object *, NULL, 486EO_API EFL_FUNC_BODYV_CONST(efl_key_wref_get, Efl_Object *, NULL,
487 EFL_FUNC_CALL(key), const char *key); 487 EFL_FUNC_CALL(key), const char *key);
488 488
489EOLIAN static void 489EOLIAN static void
@@ -492,7 +492,7 @@ _efl_object_key_value_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *
492 _key_generic_set(obj, pd, key, value, DATA_VAL, EINA_TRUE); 492 _key_generic_set(obj, pd, key, value, DATA_VAL, EINA_TRUE);
493} 493}
494 494
495EOAPI EFL_VOID_FUNC_BODYV(efl_key_value_set, EFL_FUNC_CALL(key, value), 495EO_API EFL_VOID_FUNC_BODYV(efl_key_value_set, EFL_FUNC_CALL(key, value),
496 const char *key, Eina_Value *value); 496 const char *key, Eina_Value *value);
497 497
498EOLIAN static Eina_Value * 498EOLIAN static Eina_Value *
@@ -501,7 +501,7 @@ _efl_object_key_value_get(Eo *obj, Efl_Object_Data *pd, const char *key)
501 return _key_generic_get(obj, pd, key, DATA_VAL); 501 return _key_generic_get(obj, pd, key, DATA_VAL);
502} 502}
503 503
504EOAPI EFL_FUNC_BODYV_CONST(efl_key_value_get, Eina_Value *, NULL, 504EO_API EFL_FUNC_BODYV_CONST(efl_key_value_get, Eina_Value *, NULL,
505 EFL_FUNC_CALL(key), const char *key); 505 EFL_FUNC_CALL(key), const char *key);
506 506
507EOLIAN static void 507EOLIAN static void
@@ -717,7 +717,7 @@ _efl_object_debug_name_override(Eo *obj_id EINA_UNUSED, Efl_Object_Data *pd EINA
717{ 717{
718} 718}
719 719
720EAPI void 720EO_API void
721efl_del(const Eo *obj) 721efl_del(const Eo *obj)
722{ 722{
723 if (!obj) return ; 723 if (!obj) return ;
@@ -1033,7 +1033,7 @@ _efl_object_dbg_info_get(Eo *obj EINA_UNUSED, Efl_Object_Data *pd EINA_UNUSED, E
1033 return; 1033 return;
1034} 1034}
1035 1035
1036EOAPI EFL_VOID_FUNC_BODYV(efl_dbg_info_get, EFL_FUNC_CALL(root_node), Efl_Dbg_Info *root_node); 1036EO_API EFL_VOID_FUNC_BODYV(efl_dbg_info_get, EFL_FUNC_CALL(root_node), Efl_Dbg_Info *root_node);
1037 1037
1038/* Weak reference. */ 1038/* Weak reference. */
1039 1039
@@ -1074,7 +1074,7 @@ _efl_object_wref_add(Eo *obj, Efl_Object_Data *pd, Eo **wref)
1074 } 1074 }
1075} 1075}
1076 1076
1077EOAPI EFL_VOID_FUNC_BODYV(efl_wref_add, EFL_FUNC_CALL(wref), Efl_Object **wref); 1077EO_API EFL_VOID_FUNC_BODYV(efl_wref_add, EFL_FUNC_CALL(wref), Efl_Object **wref);
1078 1078
1079EOLIAN static void 1079EOLIAN static void
1080_efl_object_wref_del(Eo *obj, Efl_Object_Data *pd, Eo **wref) 1080_efl_object_wref_del(Eo *obj, Efl_Object_Data *pd, Eo **wref)
@@ -1140,7 +1140,7 @@ err_wref_not_obj:
1140 return; 1140 return;
1141} 1141}
1142 1142
1143EOAPI EFL_VOID_FUNC_BODYV(efl_wref_del, EFL_FUNC_CALL(wref), Efl_Object **wref); 1143EO_API EFL_VOID_FUNC_BODYV(efl_wref_del, EFL_FUNC_CALL(wref), Efl_Object **wref);
1144 1144
1145static inline void 1145static inline void
1146_wref_destruct(Efl_Object_Data *pd) 1146_wref_destruct(Efl_Object_Data *pd)
@@ -1163,7 +1163,7 @@ _wref_destruct(Efl_Object_Data *pd)
1163/* XXX: Legacy support, remove when legacy is dead. */ 1163/* XXX: Legacy support, remove when legacy is dead. */
1164static Eina_Hash *_legacy_events_hash = NULL; 1164static Eina_Hash *_legacy_events_hash = NULL;
1165 1165
1166EAPI const Efl_Event_Description * 1166EO_API const Efl_Event_Description *
1167efl_object_legacy_only_event_description_get(const char *_event_name) 1167efl_object_legacy_only_event_description_get(const char *_event_name)
1168{ 1168{
1169 Eina_Stringshare *event_name = eina_stringshare_add(_event_name); 1169 Eina_Stringshare *event_name = eina_stringshare_add(_event_name);
@@ -1586,7 +1586,7 @@ err: EINA_COLD
1586 return EINA_FALSE; 1586 return EINA_FALSE;
1587} 1587}
1588 1588
1589EOAPI EFL_FUNC_BODYV(efl_event_callback_priority_add, 1589EO_API EFL_FUNC_BODYV(efl_event_callback_priority_add,
1590 Eina_Bool, 0, EFL_FUNC_CALL(desc, priority, cb, data), 1590 Eina_Bool, 0, EFL_FUNC_CALL(desc, priority, cb, data),
1591 const Efl_Event_Description *desc, 1591 const Efl_Event_Description *desc,
1592 Efl_Callback_Priority priority, 1592 Efl_Callback_Priority priority,
@@ -1636,7 +1636,7 @@ _efl_object_event_callback_del(Eo *obj, Efl_Object_Data *pd,
1636 return EINA_FALSE; 1636 return EINA_FALSE;
1637} 1637}
1638 1638
1639EOAPI EFL_FUNC_BODYV(efl_event_callback_del, 1639EO_API EFL_FUNC_BODYV(efl_event_callback_del,
1640 Eina_Bool, 0, EFL_FUNC_CALL(desc, func, user_data), 1640 Eina_Bool, 0, EFL_FUNC_CALL(desc, func, user_data),
1641 const Efl_Event_Description *desc, 1641 const Efl_Event_Description *desc,
1642 Efl_Event_Cb func, const void *user_data); 1642 Efl_Event_Cb func, const void *user_data);
@@ -1741,7 +1741,7 @@ err:
1741 return EINA_FALSE; 1741 return EINA_FALSE;
1742} 1742}
1743 1743
1744EOAPI EFL_FUNC_BODYV(efl_event_callback_array_priority_add, 1744EO_API EFL_FUNC_BODYV(efl_event_callback_array_priority_add,
1745 Eina_Bool, 0, EFL_FUNC_CALL(array, priority, data), 1745 Eina_Bool, 0, EFL_FUNC_CALL(array, priority, data),
1746 const Efl_Callback_Array_Item *array, 1746 const Efl_Callback_Array_Item *array,
1747 Efl_Callback_Priority priority, const void *data); 1747 Efl_Callback_Priority priority, const void *data);
@@ -1789,7 +1789,7 @@ _efl_object_event_callback_array_del(Eo *obj, Efl_Object_Data *pd,
1789 return EINA_FALSE; 1789 return EINA_FALSE;
1790} 1790}
1791 1791
1792EOAPI EFL_FUNC_BODYV(efl_event_callback_array_del, 1792EO_API EFL_FUNC_BODYV(efl_event_callback_array_del,
1793 Eina_Bool, 0, EFL_FUNC_CALL(array, user_data), 1793 Eina_Bool, 0, EFL_FUNC_CALL(array, user_data),
1794 const Efl_Callback_Array_Item *array, 1794 const Efl_Callback_Array_Item *array,
1795 const void *user_data); 1795 const void *user_data);
@@ -1973,11 +1973,11 @@ _efl_object_event_future_scheduler_get(const Eo *obj, Efl_Object_Data *pd, Efl_C
1973 return &sched->scheduler; 1973 return &sched->scheduler;
1974} 1974}
1975 1975
1976EOAPI EFL_FUNC_BODYV_CONST(efl_event_future_scheduler_get, 1976EO_API EFL_FUNC_BODYV_CONST(efl_event_future_scheduler_get,
1977 Eina_Future_Scheduler *, 0, EFL_FUNC_CALL(array), 1977 Eina_Future_Scheduler *, 0, EFL_FUNC_CALL(array),
1978 Efl_Callback_Array_Item *array); 1978 Efl_Callback_Array_Item *array);
1979 1979
1980EOAPI unsigned int 1980EO_API unsigned int
1981_efl_object_event_callback_count(const Eo *obj EINA_UNUSED, 1981_efl_object_event_callback_count(const Eo *obj EINA_UNUSED,
1982 Efl_Object_Data *pd, 1982 Efl_Object_Data *pd,
1983 const Efl_Event_Description *desc) 1983 const Efl_Event_Description *desc)
@@ -2009,7 +2009,7 @@ _efl_object_event_callback_count(const Eo *obj EINA_UNUSED,
2009 return r; 2009 return r;
2010} 2010}
2011 2011
2012EOAPI EFL_FUNC_BODYV_CONST(efl_event_callback_count, 2012EO_API EFL_FUNC_BODYV_CONST(efl_event_callback_count,
2013 unsigned int, 0, EFL_FUNC_CALL(desc), 2013 unsigned int, 0, EFL_FUNC_CALL(desc),
2014 const Efl_Event_Description *desc); 2014 const Efl_Event_Description *desc);
2015 2015
@@ -2185,7 +2185,7 @@ _efl_object_event_callback_call(Eo *obj_id, Efl_Object_Data *pd,
2185 return _event_callback_call(obj_id, pd, desc, event_info, EINA_FALSE); 2185 return _event_callback_call(obj_id, pd, desc, event_info, EINA_FALSE);
2186} 2186}
2187 2187
2188EOAPI EFL_FUNC_BODYV(efl_event_callback_call, 2188EO_API EFL_FUNC_BODYV(efl_event_callback_call,
2189 Eina_Bool, 0, EFL_FUNC_CALL(desc, event_info), 2189 Eina_Bool, 0, EFL_FUNC_CALL(desc, event_info),
2190 const Efl_Event_Description *desc, void *event_info); 2190 const Efl_Event_Description *desc, void *event_info);
2191 2191
@@ -2197,7 +2197,7 @@ _efl_object_event_callback_legacy_call(Eo *obj_id, Efl_Object_Data *pd,
2197 return _event_callback_call(obj_id, pd, desc, event_info, EINA_TRUE); 2197 return _event_callback_call(obj_id, pd, desc, event_info, EINA_TRUE);
2198} 2198}
2199 2199
2200EOAPI EFL_FUNC_BODYV(efl_event_callback_legacy_call, 2200EO_API EFL_FUNC_BODYV(efl_event_callback_legacy_call,
2201 Eina_Bool, 0, EFL_FUNC_CALL(desc, event_info), 2201 Eina_Bool, 0, EFL_FUNC_CALL(desc, event_info),
2202 const Efl_Event_Description *desc, void *event_info); 2202 const Efl_Event_Description *desc, void *event_info);
2203 2203
@@ -2471,7 +2471,7 @@ _efl_object_composite_part_is(Eo *comp_obj_id EINA_UNUSED, Efl_Object_Data *pd)
2471} 2471}
2472 2472
2473/* Eo_Dbg */ 2473/* Eo_Dbg */
2474EAPI void 2474EO_API void
2475efl_dbg_info_free(Efl_Dbg_Info *info) 2475efl_dbg_info_free(Efl_Dbg_Info *info)
2476{ 2476{
2477 eina_value_flush(&(info->value)); 2477 eina_value_flush(&(info->value));
@@ -2561,7 +2561,7 @@ static const Eina_Value_Type _EFL_DBG_INFO_TYPE = {
2561 _eo_dbg_info_pget 2561 _eo_dbg_info_pget
2562}; 2562};
2563 2563
2564EAPI const Eina_Value_Type *EFL_DBG_INFO_TYPE = &_EFL_DBG_INFO_TYPE; 2564EO_API const Eina_Value_Type *EFL_DBG_INFO_TYPE = &_EFL_DBG_INFO_TYPE;
2565 2565
2566 2566
2567/* EOF event callbacks */ 2567/* EOF event callbacks */
@@ -2597,7 +2597,7 @@ _efl_future_cb(void *data, const Eina_Value value, const Eina_Future *dead_futur
2597 return ret; 2597 return ret;
2598} 2598}
2599 2599
2600EOAPI Eina_Future_Desc 2600EO_API Eina_Future_Desc
2601efl_future_cb_from_desc(const Eo *o, const Efl_Future_Cb_Desc desc) 2601efl_future_cb_from_desc(const Eo *o, const Efl_Future_Cb_Desc desc)
2602{ 2602{
2603 Efl_Future_Pending *pending = NULL; 2603 Efl_Future_Pending *pending = NULL;
@@ -2625,7 +2625,7 @@ efl_future_cb_from_desc(const Eo *o, const Efl_Future_Cb_Desc desc)
2625 return (Eina_Future_Desc){ .cb = _efl_future_cb, .data = pending, .storage = storage }; 2625 return (Eina_Future_Desc){ .cb = _efl_future_cb, .data = pending, .storage = storage };
2626} 2626}
2627 2627
2628EOAPI Eina_Future * 2628EO_API Eina_Future *
2629efl_future_chain_array(Eo *obj, 2629efl_future_chain_array(Eo *obj,
2630 Eina_Future *prev, 2630 Eina_Future *prev,
2631 const Efl_Future_Cb_Desc descs[]) 2631 const Efl_Future_Cb_Desc descs[])
@@ -2783,7 +2783,7 @@ _efl_object_allow_parent_unref_get(const Eo *obj_id EINA_UNUSED, Efl_Object_Data
2783 return pd->allow_parent_unref; 2783 return pd->allow_parent_unref;
2784} 2784}
2785 2785
2786EAPI void 2786EO_API void
2787___efl_auto_unref_set(Eo *obj_id, Eina_Bool enable) 2787___efl_auto_unref_set(Eo *obj_id, Eina_Bool enable)
2788{ 2788{
2789 // Write-only property 2789 // Write-only property
diff --git a/src/lib/eo/eo_internal.h b/src/lib/eo/eo_internal.h
index 9e2980914a..bbbc502eb4 100644
--- a/src/lib/eo/eo_internal.h
+++ b/src/lib/eo/eo_internal.h
@@ -1,31 +1,7 @@
1#ifndef _EO_INTERNAL_H_ 1#ifndef _EO_INTERNAL_H_
2#define _EO_INTERNAL_H_ 2#define _EO_INTERNAL_H_
3 3
4#ifdef EAPI 4#include <Eo.h>
5# undef EAPI
6#endif
7
8#ifdef _WIN32
9# ifdef EFL_BUILD
10# ifdef DLL_EXPORT
11# define EAPI __declspec(dllexport)
12# else
13# define EAPI
14# endif
15# else
16# define EAPI __declspec(dllimport)
17# endif
18#else
19# ifdef __GNUC__
20# if __GNUC__ >= 4
21# define EAPI __attribute__ ((visibility("default")))
22# else
23# define EAPI
24# endif
25# else
26# define EAPI
27# endif
28#endif
29 5
30typedef unsigned char Eina_Bool; 6typedef unsigned char Eina_Bool;
31typedef struct _Eo_Opaque Eo; 7typedef struct _Eo_Opaque Eo;
@@ -37,12 +13,12 @@ typedef struct _Efl_Event_Description Efl_Event_Description;
37 * anything about them. 13 * anything about them.
38 * @internal 14 * @internal
39 */ 15 */
40EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name); 16EO_API const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name);
41 17
42EAPI void ___efl_auto_unref_set(Eo *obj_id, Eina_Bool enable); 18EO_API void ___efl_auto_unref_set(Eo *obj_id, Eina_Bool enable);
43 19
44EAPI int ___efl_ref2_count(const Eo *obj_id); 20EO_API int ___efl_ref2_count(const Eo *obj_id);
45EAPI void ___efl_ref2_reset(const Eo *obj_id); 21EO_API void ___efl_ref2_reset(const Eo *obj_id);
46 22
47#define EFL_CLASS_SIMPLE_CLASS(FUNC, NAME, ABSTRACT_CLASS) \ 23#define EFL_CLASS_SIMPLE_CLASS(FUNC, NAME, ABSTRACT_CLASS) \
48static const Efl_Class_Description FUNC ##_realized_class_desc = { \ 24static const Efl_Class_Description FUNC ##_realized_class_desc = { \
@@ -53,7 +29,4 @@ static const Efl_Class_Description FUNC ##_realized_class_desc = { \
53}; \ 29}; \
54EFL_DEFINE_CLASS(FUNC ##_realized_class_get, &FUNC ##_realized_class_desc, ABSTRACT_CLASS, NULL) 30EFL_DEFINE_CLASS(FUNC ##_realized_class_get, &FUNC ##_realized_class_desc, ABSTRACT_CLASS, NULL)
55 31
56#undef EAPI
57#define EAPI
58
59#endif 32#endif
diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index 9cd33775b0..61027926b3 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -38,6 +38,7 @@ foreach eo_file : pub_eo_types_files
38 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 38 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
39 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 39 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
40 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 40 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
41 '-e', 'EO_API',
41 '-gchd', '@INPUT@']) 42 '-gchd', '@INPUT@'])
42endforeach 43endforeach
43 44
@@ -54,6 +55,7 @@ foreach eo_file : pub_eo_files
54 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 55 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
55 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 56 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
56 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 57 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
58 '-e', 'EO_API',
57 '-gchd', '@INPUT@']) 59 '-gchd', '@INPUT@'])
58endforeach 60endforeach
59 61
@@ -61,7 +63,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
61 63
62eo_lib = library('eo', 64eo_lib = library('eo',
63 eo_src, pub_eo_file_target, 65 eo_src, pub_eo_file_target,
64 c_args : package_c_args, 66 c_args : [package_c_args, '-DEO_BUILD'],
65 dependencies: [eo_deps, eo_pub_deps, eo_ext_deps], 67 dependencies: [eo_deps, eo_pub_deps, eo_ext_deps],
66 install: true, 68 install: true,
67 version : meson.project_version() 69 version : meson.project_version()
@@ -69,7 +71,7 @@ eo_lib = library('eo',
69 71
70eo_lib_dbg = library('eo_dbg', 72eo_lib_dbg = library('eo_dbg',
71 eo_src, pub_eo_file_target, 73 eo_src, pub_eo_file_target,
72 c_args : package_c_args + [ '-DEO_DEBUG' ], 74 c_args : [package_c_args, '-DEO_DEBUG', '-DEO_BUILD'],
73 dependencies: [eo_deps, eo_pub_deps, eo_ext_deps], 75 dependencies: [eo_deps, eo_pub_deps, eo_ext_deps],
74 install: true, 76 install: true,
75 version : meson.project_version() 77 version : meson.project_version()
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index 2f830bde8a..38ab147860 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -16,7 +16,7 @@ _prot_print(Eo *obj, void *class_data EINA_UNUSED)
16 printf("%s %d\n", __func__, pd->protected_x1); 16 printf("%s %d\n", __func__, pd->protected_x1);
17} 17}
18 18
19EAPI EFL_VOID_FUNC_BODY(inherit_prot_print); 19EFL_VOID_FUNC_BODY(inherit_prot_print);
20 20
21static Eina_Bool 21static Eina_Bool
22_class_initializer(Efl_Class *klass) 22_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eo/access/access_inherit.h b/src/tests/eo/access/access_inherit.h
index 20fa1d3102..9ff8191b0b 100644
--- a/src/tests/eo/access/access_inherit.h
+++ b/src/tests/eo/access/access_inherit.h
@@ -1,7 +1,7 @@
1#ifndef INHERIT_H 1#ifndef INHERIT_H
2#define INHERIT_H 2#define INHERIT_H
3 3
4EAPI void inherit_prot_print(Eo *obj); 4void inherit_prot_print(Eo *obj);
5 5
6#define INHERIT_CLASS inherit_class_get() 6#define INHERIT_CLASS inherit_class_get()
7const Efl_Class *inherit_class_get(void); 7const Efl_Class *inherit_class_get(void);
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 5b75d0c52b..0076d8b2ec 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -12,7 +12,7 @@ typedef struct
12 int a; 12 int a;
13} Private_Data; 13} Private_Data;
14 14
15EAPI const Efl_Event_Description _EV_A_CHANGED = 15const Efl_Event_Description _EV_A_CHANGED =
16 EFL_EVENT_DESCRIPTION("a,changed"); 16 EFL_EVENT_DESCRIPTION("a,changed");
17 17
18#define MY_CLASS SIMPLE_CLASS 18#define MY_CLASS SIMPLE_CLASS
@@ -30,7 +30,7 @@ _a_set(Eo *obj, void *class_data, int a)
30 efl_event_callback_legacy_call(obj, EV_A_CHANGED, &pd->a); 30 efl_event_callback_legacy_call(obj, EV_A_CHANGED, &pd->a);
31} 31}
32 32
33EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); 33EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
34 34
35static Eina_Bool 35static Eina_Bool
36_class_initializer(Efl_Class *klass) 36_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eo/access/access_simple.h b/src/tests/eo/access/access_simple.h
index 22b656a831..935492e609 100644
--- a/src/tests/eo/access/access_simple.h
+++ b/src/tests/eo/access/access_simple.h
@@ -1,7 +1,7 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4EAPI void simple_a_set(Eo *obj, int a); 4void simple_a_set(Eo *obj, int a);
5 5
6typedef struct 6typedef struct
7{ 7{
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index b9bc70fb78..132b393b72 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -5,7 +5,7 @@
5#include "Eo.h" 5#include "Eo.h"
6#include "composite_objects_simple.h" 6#include "composite_objects_simple.h"
7 7
8EAPI const Efl_Event_Description _EV_A_CHANGED = 8const Efl_Event_Description _EV_A_CHANGED =
9 EFL_EVENT_DESCRIPTION("a,changed"); 9 EFL_EVENT_DESCRIPTION("a,changed");
10 10
11#define MY_CLASS SIMPLE_CLASS 11#define MY_CLASS SIMPLE_CLASS
@@ -27,73 +27,73 @@ _a_get(Eo *obj EINA_UNUSED, void *class_data)
27 return pd->a; 27 return pd->a;
28} 28}
29 29
30EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); 30EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
31EAPI EFL_FUNC_BODY(simple_a_get, int, 0); 31EFL_FUNC_BODY(simple_a_get, int, 0);
32 32
33EAPI EFL_VOID_FUNC_BODYV(simple_a_set1, EFL_FUNC_CALL(a), int a); 33EFL_VOID_FUNC_BODYV(simple_a_set1, EFL_FUNC_CALL(a), int a);
34EAPI EFL_VOID_FUNC_BODYV(simple_a_set2, EFL_FUNC_CALL(a), int a); 34EFL_VOID_FUNC_BODYV(simple_a_set2, EFL_FUNC_CALL(a), int a);
35EAPI EFL_VOID_FUNC_BODYV(simple_a_set3, EFL_FUNC_CALL(a), int a); 35EFL_VOID_FUNC_BODYV(simple_a_set3, EFL_FUNC_CALL(a), int a);
36EAPI EFL_VOID_FUNC_BODYV(simple_a_set4, EFL_FUNC_CALL(a), int a); 36EFL_VOID_FUNC_BODYV(simple_a_set4, EFL_FUNC_CALL(a), int a);
37EAPI EFL_VOID_FUNC_BODYV(simple_a_set5, EFL_FUNC_CALL(a), int a); 37EFL_VOID_FUNC_BODYV(simple_a_set5, EFL_FUNC_CALL(a), int a);
38EAPI EFL_VOID_FUNC_BODYV(simple_a_set6, EFL_FUNC_CALL(a), int a); 38EFL_VOID_FUNC_BODYV(simple_a_set6, EFL_FUNC_CALL(a), int a);
39EAPI EFL_VOID_FUNC_BODYV(simple_a_set7, EFL_FUNC_CALL(a), int a); 39EFL_VOID_FUNC_BODYV(simple_a_set7, EFL_FUNC_CALL(a), int a);
40EAPI EFL_VOID_FUNC_BODYV(simple_a_set8, EFL_FUNC_CALL(a), int a); 40EFL_VOID_FUNC_BODYV(simple_a_set8, EFL_FUNC_CALL(a), int a);
41EAPI EFL_VOID_FUNC_BODYV(simple_a_set9, EFL_FUNC_CALL(a), int a); 41EFL_VOID_FUNC_BODYV(simple_a_set9, EFL_FUNC_CALL(a), int a);
42EAPI EFL_VOID_FUNC_BODYV(simple_a_set10, EFL_FUNC_CALL(a), int a); 42EFL_VOID_FUNC_BODYV(simple_a_set10, EFL_FUNC_CALL(a), int a);
43EAPI EFL_VOID_FUNC_BODYV(simple_a_set11, EFL_FUNC_CALL(a), int a); 43EFL_VOID_FUNC_BODYV(simple_a_set11, EFL_FUNC_CALL(a), int a);
44EAPI EFL_VOID_FUNC_BODYV(simple_a_set12, EFL_FUNC_CALL(a), int a); 44EFL_VOID_FUNC_BODYV(simple_a_set12, EFL_FUNC_CALL(a), int a);
45EAPI EFL_VOID_FUNC_BODYV(simple_a_set13, EFL_FUNC_CALL(a), int a); 45EFL_VOID_FUNC_BODYV(simple_a_set13, EFL_FUNC_CALL(a), int a);
46EAPI EFL_VOID_FUNC_BODYV(simple_a_set14, EFL_FUNC_CALL(a), int a); 46EFL_VOID_FUNC_BODYV(simple_a_set14, EFL_FUNC_CALL(a), int a);
47EAPI EFL_VOID_FUNC_BODYV(simple_a_set15, EFL_FUNC_CALL(a), int a); 47EFL_VOID_FUNC_BODYV(simple_a_set15, EFL_FUNC_CALL(a), int a);
48EAPI EFL_VOID_FUNC_BODYV(simple_a_set16, EFL_FUNC_CALL(a), int a); 48EFL_VOID_FUNC_BODYV(simple_a_set16, EFL_FUNC_CALL(a), int a);
49EAPI EFL_VOID_FUNC_BODYV(simple_a_set17, EFL_FUNC_CALL(a), int a); 49EFL_VOID_FUNC_BODYV(simple_a_set17, EFL_FUNC_CALL(a), int a);
50EAPI EFL_VOID_FUNC_BODYV(simple_a_set18, EFL_FUNC_CALL(a), int a); 50EFL_VOID_FUNC_BODYV(simple_a_set18, EFL_FUNC_CALL(a), int a);
51EAPI EFL_VOID_FUNC_BODYV(simple_a_set19, EFL_FUNC_CALL(a), int a); 51EFL_VOID_FUNC_BODYV(simple_a_set19, EFL_FUNC_CALL(a), int a);
52EAPI EFL_VOID_FUNC_BODYV(simple_a_set20, EFL_FUNC_CALL(a), int a); 52EFL_VOID_FUNC_BODYV(simple_a_set20, EFL_FUNC_CALL(a), int a);
53EAPI EFL_VOID_FUNC_BODYV(simple_a_set21, EFL_FUNC_CALL(a), int a); 53EFL_VOID_FUNC_BODYV(simple_a_set21, EFL_FUNC_CALL(a), int a);
54EAPI EFL_VOID_FUNC_BODYV(simple_a_set22, EFL_FUNC_CALL(a), int a); 54EFL_VOID_FUNC_BODYV(simple_a_set22, EFL_FUNC_CALL(a), int a);
55EAPI EFL_VOID_FUNC_BODYV(simple_a_set23, EFL_FUNC_CALL(a), int a); 55EFL_VOID_FUNC_BODYV(simple_a_set23, EFL_FUNC_CALL(a), int a);
56EAPI EFL_VOID_FUNC_BODYV(simple_a_set24, EFL_FUNC_CALL(a), int a); 56EFL_VOID_FUNC_BODYV(simple_a_set24, EFL_FUNC_CALL(a), int a);
57EAPI EFL_VOID_FUNC_BODYV(simple_a_set25, EFL_FUNC_CALL(a), int a); 57EFL_VOID_FUNC_BODYV(simple_a_set25, EFL_FUNC_CALL(a), int a);
58EAPI EFL_VOID_FUNC_BODYV(simple_a_set26, EFL_FUNC_CALL(a), int a); 58EFL_VOID_FUNC_BODYV(simple_a_set26, EFL_FUNC_CALL(a), int a);
59EAPI EFL_VOID_FUNC_BODYV(simple_a_set27, EFL_FUNC_CALL(a), int a); 59EFL_VOID_FUNC_BODYV(simple_a_set27, EFL_FUNC_CALL(a), int a);
60EAPI EFL_VOID_FUNC_BODYV(simple_a_set28, EFL_FUNC_CALL(a), int a); 60EFL_VOID_FUNC_BODYV(simple_a_set28, EFL_FUNC_CALL(a), int a);
61EAPI EFL_VOID_FUNC_BODYV(simple_a_set29, EFL_FUNC_CALL(a), int a); 61EFL_VOID_FUNC_BODYV(simple_a_set29, EFL_FUNC_CALL(a), int a);
62EAPI EFL_VOID_FUNC_BODYV(simple_a_set30, EFL_FUNC_CALL(a), int a); 62EFL_VOID_FUNC_BODYV(simple_a_set30, EFL_FUNC_CALL(a), int a);
63EAPI EFL_VOID_FUNC_BODYV(simple_a_set31, EFL_FUNC_CALL(a), int a); 63EFL_VOID_FUNC_BODYV(simple_a_set31, EFL_FUNC_CALL(a), int a);
64EAPI EFL_VOID_FUNC_BODYV(simple_a_set32, EFL_FUNC_CALL(a), int a); 64EFL_VOID_FUNC_BODYV(simple_a_set32, EFL_FUNC_CALL(a), int a);
65EAPI EFL_VOID_FUNC_BODYV(simple_a_get1, EFL_FUNC_CALL(a), int a); 65EFL_VOID_FUNC_BODYV(simple_a_get1, EFL_FUNC_CALL(a), int a);
66EAPI EFL_VOID_FUNC_BODYV(simple_a_get2, EFL_FUNC_CALL(a), int a); 66EFL_VOID_FUNC_BODYV(simple_a_get2, EFL_FUNC_CALL(a), int a);
67EAPI EFL_VOID_FUNC_BODYV(simple_a_get3, EFL_FUNC_CALL(a), int a); 67EFL_VOID_FUNC_BODYV(simple_a_get3, EFL_FUNC_CALL(a), int a);
68EAPI EFL_VOID_FUNC_BODYV(simple_a_get4, EFL_FUNC_CALL(a), int a); 68EFL_VOID_FUNC_BODYV(simple_a_get4, EFL_FUNC_CALL(a), int a);
69EAPI EFL_VOID_FUNC_BODYV(simple_a_get5, EFL_FUNC_CALL(a), int a); 69EFL_VOID_FUNC_BODYV(simple_a_get5, EFL_FUNC_CALL(a), int a);
70EAPI EFL_VOID_FUNC_BODYV(simple_a_get6, EFL_FUNC_CALL(a), int a); 70EFL_VOID_FUNC_BODYV(simple_a_get6, EFL_FUNC_CALL(a), int a);
71EAPI EFL_VOID_FUNC_BODYV(simple_a_get7, EFL_FUNC_CALL(a), int a); 71EFL_VOID_FUNC_BODYV(simple_a_get7, EFL_FUNC_CALL(a), int a);
72EAPI EFL_VOID_FUNC_BODYV(simple_a_get8, EFL_FUNC_CALL(a), int a); 72EFL_VOID_FUNC_BODYV(simple_a_get8, EFL_FUNC_CALL(a), int a);
73EAPI EFL_VOID_FUNC_BODYV(simple_a_get9, EFL_FUNC_CALL(a), int a); 73EFL_VOID_FUNC_BODYV(simple_a_get9, EFL_FUNC_CALL(a), int a);
74EAPI EFL_VOID_FUNC_BODYV(simple_a_get10, EFL_FUNC_CALL(a), int a); 74EFL_VOID_FUNC_BODYV(simple_a_get10, EFL_FUNC_CALL(a), int a);
75EAPI EFL_VOID_FUNC_BODYV(simple_a_get11, EFL_FUNC_CALL(a), int a); 75EFL_VOID_FUNC_BODYV(simple_a_get11, EFL_FUNC_CALL(a), int a);
76EAPI EFL_VOID_FUNC_BODYV(simple_a_get12, EFL_FUNC_CALL(a), int a); 76EFL_VOID_FUNC_BODYV(simple_a_get12, EFL_FUNC_CALL(a), int a);
77EAPI EFL_VOID_FUNC_BODYV(simple_a_get13, EFL_FUNC_CALL(a), int a); 77EFL_VOID_FUNC_BODYV(simple_a_get13, EFL_FUNC_CALL(a), int a);
78EAPI EFL_VOID_FUNC_BODYV(simple_a_get14, EFL_FUNC_CALL(a), int a); 78EFL_VOID_FUNC_BODYV(simple_a_get14, EFL_FUNC_CALL(a), int a);
79EAPI EFL_VOID_FUNC_BODYV(simple_a_get15, EFL_FUNC_CALL(a), int a); 79EFL_VOID_FUNC_BODYV(simple_a_get15, EFL_FUNC_CALL(a), int a);
80EAPI EFL_VOID_FUNC_BODYV(simple_a_get16, EFL_FUNC_CALL(a), int a); 80EFL_VOID_FUNC_BODYV(simple_a_get16, EFL_FUNC_CALL(a), int a);
81EAPI EFL_VOID_FUNC_BODYV(simple_a_get17, EFL_FUNC_CALL(a), int a); 81EFL_VOID_FUNC_BODYV(simple_a_get17, EFL_FUNC_CALL(a), int a);
82EAPI EFL_VOID_FUNC_BODYV(simple_a_get18, EFL_FUNC_CALL(a), int a); 82EFL_VOID_FUNC_BODYV(simple_a_get18, EFL_FUNC_CALL(a), int a);
83EAPI EFL_VOID_FUNC_BODYV(simple_a_get19, EFL_FUNC_CALL(a), int a); 83EFL_VOID_FUNC_BODYV(simple_a_get19, EFL_FUNC_CALL(a), int a);
84EAPI EFL_VOID_FUNC_BODYV(simple_a_get20, EFL_FUNC_CALL(a), int a); 84EFL_VOID_FUNC_BODYV(simple_a_get20, EFL_FUNC_CALL(a), int a);
85EAPI EFL_VOID_FUNC_BODYV(simple_a_get21, EFL_FUNC_CALL(a), int a); 85EFL_VOID_FUNC_BODYV(simple_a_get21, EFL_FUNC_CALL(a), int a);
86EAPI EFL_VOID_FUNC_BODYV(simple_a_get22, EFL_FUNC_CALL(a), int a); 86EFL_VOID_FUNC_BODYV(simple_a_get22, EFL_FUNC_CALL(a), int a);
87EAPI EFL_VOID_FUNC_BODYV(simple_a_get23, EFL_FUNC_CALL(a), int a); 87EFL_VOID_FUNC_BODYV(simple_a_get23, EFL_FUNC_CALL(a), int a);
88EAPI EFL_VOID_FUNC_BODYV(simple_a_get24, EFL_FUNC_CALL(a), int a); 88EFL_VOID_FUNC_BODYV(simple_a_get24, EFL_FUNC_CALL(a), int a);
89EAPI EFL_VOID_FUNC_BODYV(simple_a_get25, EFL_FUNC_CALL(a), int a); 89EFL_VOID_FUNC_BODYV(simple_a_get25, EFL_FUNC_CALL(a), int a);
90EAPI EFL_VOID_FUNC_BODYV(simple_a_get26, EFL_FUNC_CALL(a), int a); 90EFL_VOID_FUNC_BODYV(simple_a_get26, EFL_FUNC_CALL(a), int a);
91EAPI EFL_VOID_FUNC_BODYV(simple_a_get27, EFL_FUNC_CALL(a), int a); 91EFL_VOID_FUNC_BODYV(simple_a_get27, EFL_FUNC_CALL(a), int a);
92EAPI EFL_VOID_FUNC_BODYV(simple_a_get28, EFL_FUNC_CALL(a), int a); 92EFL_VOID_FUNC_BODYV(simple_a_get28, EFL_FUNC_CALL(a), int a);
93EAPI EFL_VOID_FUNC_BODYV(simple_a_get29, EFL_FUNC_CALL(a), int a); 93EFL_VOID_FUNC_BODYV(simple_a_get29, EFL_FUNC_CALL(a), int a);
94EAPI EFL_VOID_FUNC_BODYV(simple_a_get30, EFL_FUNC_CALL(a), int a); 94EFL_VOID_FUNC_BODYV(simple_a_get30, EFL_FUNC_CALL(a), int a);
95EAPI EFL_VOID_FUNC_BODYV(simple_a_get31, EFL_FUNC_CALL(a), int a); 95EFL_VOID_FUNC_BODYV(simple_a_get31, EFL_FUNC_CALL(a), int a);
96EAPI EFL_VOID_FUNC_BODYV(simple_a_get32, EFL_FUNC_CALL(a), int a); 96EFL_VOID_FUNC_BODYV(simple_a_get32, EFL_FUNC_CALL(a), int a);
97 97
98 98
99static Eina_Bool 99static Eina_Bool
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.h b/src/tests/eo/composite_objects/composite_objects_simple.h
index eb97c94404..b24dd98a5c 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.h
+++ b/src/tests/eo/composite_objects/composite_objects_simple.h
@@ -6,73 +6,73 @@ typedef struct
6 int a; 6 int a;
7} Simple_Public_Data; 7} Simple_Public_Data;
8 8
9EAPI void simple_a_set(Eo *obj, int a); 9void simple_a_set(Eo *obj, int a);
10EAPI int simple_a_get(Eo *obj); 10int simple_a_get(Eo *obj);
11 11
12EAPI void simple_a_set1(Eo *obj, int a); 12void simple_a_set1(Eo *obj, int a);
13EAPI void simple_a_set2(Eo *obj, int a); 13void simple_a_set2(Eo *obj, int a);
14EAPI void simple_a_set3(Eo *obj, int a); 14void simple_a_set3(Eo *obj, int a);
15EAPI void simple_a_set4(Eo *obj, int a); 15void simple_a_set4(Eo *obj, int a);
16EAPI void simple_a_set5(Eo *obj, int a); 16void simple_a_set5(Eo *obj, int a);
17EAPI void simple_a_set6(Eo *obj, int a); 17void simple_a_set6(Eo *obj, int a);
18EAPI void simple_a_set7(Eo *obj, int a); 18void simple_a_set7(Eo *obj, int a);
19EAPI void simple_a_set8(Eo *obj, int a); 19void simple_a_set8(Eo *obj, int a);
20EAPI void simple_a_set9(Eo *obj, int a); 20void simple_a_set9(Eo *obj, int a);
21EAPI void simple_a_set10(Eo *obj, int a); 21void simple_a_set10(Eo *obj, int a);
22EAPI void simple_a_set11(Eo *obj, int a); 22void simple_a_set11(Eo *obj, int a);
23EAPI void simple_a_set12(Eo *obj, int a); 23void simple_a_set12(Eo *obj, int a);
24EAPI void simple_a_set13(Eo *obj, int a); 24void simple_a_set13(Eo *obj, int a);
25EAPI void simple_a_set14(Eo *obj, int a); 25void simple_a_set14(Eo *obj, int a);
26EAPI void simple_a_set15(Eo *obj, int a); 26void simple_a_set15(Eo *obj, int a);
27EAPI void simple_a_set16(Eo *obj, int a); 27void simple_a_set16(Eo *obj, int a);
28EAPI void simple_a_set17(Eo *obj, int a); 28void simple_a_set17(Eo *obj, int a);
29EAPI void simple_a_set18(Eo *obj, int a); 29void simple_a_set18(Eo *obj, int a);
30EAPI void simple_a_set19(Eo *obj, int a); 30void simple_a_set19(Eo *obj, int a);
31EAPI void simple_a_set20(Eo *obj, int a); 31void simple_a_set20(Eo *obj, int a);
32EAPI void simple_a_set21(Eo *obj, int a); 32void simple_a_set21(Eo *obj, int a);
33EAPI void simple_a_set22(Eo *obj, int a); 33void simple_a_set22(Eo *obj, int a);
34EAPI void simple_a_set23(Eo *obj, int a); 34void simple_a_set23(Eo *obj, int a);
35EAPI void simple_a_set24(Eo *obj, int a); 35void simple_a_set24(Eo *obj, int a);
36EAPI void simple_a_set25(Eo *obj, int a); 36void simple_a_set25(Eo *obj, int a);
37EAPI void simple_a_set26(Eo *obj, int a); 37void simple_a_set26(Eo *obj, int a);
38EAPI void simple_a_set27(Eo *obj, int a); 38void simple_a_set27(Eo *obj, int a);
39EAPI void simple_a_set28(Eo *obj, int a); 39void simple_a_set28(Eo *obj, int a);
40EAPI void simple_a_set29(Eo *obj, int a); 40void simple_a_set29(Eo *obj, int a);
41EAPI void simple_a_set30(Eo *obj, int a); 41void simple_a_set30(Eo *obj, int a);
42EAPI void simple_a_set31(Eo *obj, int a); 42void simple_a_set31(Eo *obj, int a);
43EAPI void simple_a_set32(Eo *obj, int a); 43void simple_a_set32(Eo *obj, int a);
44EAPI void simple_a_get1(Eo *obj, int a); 44void simple_a_get1(Eo *obj, int a);
45EAPI void simple_a_get2(Eo *obj, int a); 45void simple_a_get2(Eo *obj, int a);
46EAPI void simple_a_get3(Eo *obj, int a); 46void simple_a_get3(Eo *obj, int a);
47EAPI void simple_a_get4(Eo *obj, int a); 47void simple_a_get4(Eo *obj, int a);
48EAPI void simple_a_get5(Eo *obj, int a); 48void simple_a_get5(Eo *obj, int a);
49EAPI void simple_a_get6(Eo *obj, int a); 49void simple_a_get6(Eo *obj, int a);
50EAPI void simple_a_get7(Eo *obj, int a); 50void simple_a_get7(Eo *obj, int a);
51EAPI void simple_a_get8(Eo *obj, int a); 51void simple_a_get8(Eo *obj, int a);
52EAPI void simple_a_get9(Eo *obj, int a); 52void simple_a_get9(Eo *obj, int a);
53EAPI void simple_a_get10(Eo *obj, int a); 53void simple_a_get10(Eo *obj, int a);
54EAPI void simple_a_get11(Eo *obj, int a); 54void simple_a_get11(Eo *obj, int a);
55EAPI void simple_a_get12(Eo *obj, int a); 55void simple_a_get12(Eo *obj, int a);
56EAPI void simple_a_get13(Eo *obj, int a); 56void simple_a_get13(Eo *obj, int a);
57EAPI void simple_a_get14(Eo *obj, int a); 57void simple_a_get14(Eo *obj, int a);
58EAPI void simple_a_get15(Eo *obj, int a); 58void simple_a_get15(Eo *obj, int a);
59EAPI void simple_a_get16(Eo *obj, int a); 59void simple_a_get16(Eo *obj, int a);
60EAPI void simple_a_get17(Eo *obj, int a); 60void simple_a_get17(Eo *obj, int a);
61EAPI void simple_a_get18(Eo *obj, int a); 61void simple_a_get18(Eo *obj, int a);
62EAPI void simple_a_get19(Eo *obj, int a); 62void simple_a_get19(Eo *obj, int a);
63EAPI void simple_a_get20(Eo *obj, int a); 63void simple_a_get20(Eo *obj, int a);
64EAPI void simple_a_get21(Eo *obj, int a); 64void simple_a_get21(Eo *obj, int a);
65EAPI void simple_a_get22(Eo *obj, int a); 65void simple_a_get22(Eo *obj, int a);
66EAPI void simple_a_get23(Eo *obj, int a); 66void simple_a_get23(Eo *obj, int a);
67EAPI void simple_a_get24(Eo *obj, int a); 67void simple_a_get24(Eo *obj, int a);
68EAPI void simple_a_get25(Eo *obj, int a); 68void simple_a_get25(Eo *obj, int a);
69EAPI void simple_a_get26(Eo *obj, int a); 69void simple_a_get26(Eo *obj, int a);
70EAPI void simple_a_get27(Eo *obj, int a); 70void simple_a_get27(Eo *obj, int a);
71EAPI void simple_a_get28(Eo *obj, int a); 71void simple_a_get28(Eo *obj, int a);
72EAPI void simple_a_get29(Eo *obj, int a); 72void simple_a_get29(Eo *obj, int a);
73EAPI void simple_a_get30(Eo *obj, int a); 73void simple_a_get30(Eo *obj, int a);
74EAPI void simple_a_get31(Eo *obj, int a); 74void simple_a_get31(Eo *obj, int a);
75EAPI void simple_a_get32(Eo *obj, int a); 75void simple_a_get32(Eo *obj, int a);
76 76
77extern const Efl_Event_Description _EV_A_CHANGED; 77extern const Efl_Event_Description _EV_A_CHANGED;
78#define EV_A_CHANGED (&(_EV_A_CHANGED)) 78#define EV_A_CHANGED (&(_EV_A_CHANGED))
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index c3cbdc50b1..9380d4885d 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -35,7 +35,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
35 my_init_count--; 35 my_init_count--;
36} 36}
37 37
38EAPI EFL_VOID_FUNC_BODYV(mixin_add_and_print, EFL_FUNC_CALL(x), int x); 38EFL_VOID_FUNC_BODYV(mixin_add_and_print, EFL_FUNC_CALL(x), int x);
39 39
40static Eina_Bool 40static Eina_Bool
41_class_initializer(Efl_Class *klass) 41_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eo/constructors/constructors_mixin.h b/src/tests/eo/constructors/constructors_mixin.h
index ae7a85df8c..9894c8d095 100644
--- a/src/tests/eo/constructors/constructors_mixin.h
+++ b/src/tests/eo/constructors/constructors_mixin.h
@@ -1,7 +1,7 @@
1#ifndef MIXIN_H 1#ifndef MIXIN_H
2#define MIXIN_H 2#define MIXIN_H
3 3
4EAPI void mixin_add_and_print(Eo *obj, int x); 4void mixin_add_and_print(Eo *obj, int x);
5 5
6#define MIXIN_CLASS mixin_class_get() 6#define MIXIN_CLASS mixin_class_get()
7const Efl_Class *mixin_class_get(void); 7const Efl_Class *mixin_class_get(void);
diff --git a/src/tests/eo/constructors/constructors_simple.h b/src/tests/eo/constructors/constructors_simple.h
index 03f7f4b22c..23dd21c610 100644
--- a/src/tests/eo/constructors/constructors_simple.h
+++ b/src/tests/eo/constructors/constructors_simple.h
@@ -1,10 +1,10 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4EAPI void simple_a_set(Eo *obj, int a); 4void simple_a_set(Eo *obj, int a);
5EAPI int simple_a_get(Eo *obj); 5int simple_a_get(Eo *obj);
6EAPI void simple_b_set(Eo *obj, int b); 6void simple_b_set(Eo *obj, int b);
7EAPI int simple_b_get(Eo *obj); 7int simple_b_get(Eo *obj);
8 8
9#define SIMPLE_CLASS simple_class_get() 9#define SIMPLE_CLASS simple_class_get()
10const Efl_Class *simple_class_get(void); 10const Efl_Class *simple_class_get(void);
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index e4aa147b67..09ef1f8563 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -42,8 +42,8 @@ _print2(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
42 return EINA_TRUE; 42 return EINA_TRUE;
43} 43}
44 44
45EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); 45EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
46EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); 46EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
47 47
48static Eina_Bool 48static Eina_Bool
49_class_initializer(Efl_Class *klass) 49_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.h b/src/tests/eo/function_overrides/function_overrides_inherit2.h
index 773ead195b..f0d0079a01 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.h
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.h
@@ -1,8 +1,8 @@
1#ifndef INHERIT2_H 1#ifndef INHERIT2_H
2#define INHERIT2_H 2#define INHERIT2_H
3 3
4EAPI Eina_Bool inherit2_print(Eo *obj); 4Eina_Bool inherit2_print(Eo *obj);
5EAPI Eina_Bool inherit2_print2(Eo *obj); 5Eina_Bool inherit2_print2(Eo *obj);
6 6
7#define INHERIT2_CLASS inherit2_class_get() 7#define INHERIT2_CLASS inherit2_class_get()
8const Efl_Class *inherit2_class_get(void); 8const Efl_Class *inherit2_class_get(void);
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index fbd5681367..c0cbac5170 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -51,10 +51,10 @@ _class_print2(Efl_Class *klass, void *class_data EINA_UNUSED)
51 return EINA_TRUE; 51 return EINA_TRUE;
52} 52}
53 53
54EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); 54EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
55EAPI EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); 55EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
56EAPI EFL_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE); 56EFL_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
57EAPI EFL_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE); 57EFL_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
58 58
59static Eina_Bool 59static Eina_Bool
60_class_initializer(Efl_Class *klass) 60_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.h b/src/tests/eo/function_overrides/function_overrides_simple.h
index 87dfba7ba0..46862a226e 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.h
+++ b/src/tests/eo/function_overrides/function_overrides_simple.h
@@ -6,10 +6,10 @@ typedef struct
6 int a; 6 int a;
7} Simple_Public_Data; 7} Simple_Public_Data;
8 8
9EAPI void simple_a_set(Eo *obj, int a); 9void simple_a_set(Eo *obj, int a);
10EAPI Eina_Bool simple_a_print(Eo *obj); 10Eina_Bool simple_a_print(Eo *obj);
11EAPI Eina_Bool simple_class_print(const Eo *obj); 11Eina_Bool simple_class_print(const Eo *obj);
12EAPI Eina_Bool simple_class_print2(const Eo *obj); 12Eina_Bool simple_class_print2(const Eo *obj);
13 13
14extern const Efl_Event_Description _SIG_A_CHANGED; 14extern const Efl_Event_Description _SIG_A_CHANGED;
15#define SIG_A_CHANGED (&(_SIG_A_CHANGED)) 15#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
diff --git a/src/tests/eo/interface/interface_interface.h b/src/tests/eo/interface/interface_interface.h
index 6f454e6270..6186a46daf 100644
--- a/src/tests/eo/interface/interface_interface.h
+++ b/src/tests/eo/interface/interface_interface.h
@@ -1,7 +1,7 @@
1#ifndef INTERFACE_H 1#ifndef INTERFACE_H
2#define INTERFACE_H 2#define INTERFACE_H
3 3
4EAPI int interface_ab_sum_get(Eo *obj); 4int interface_ab_sum_get(Eo *obj);
5 5
6#define INTERFACE_CLASS interface_class_get() 6#define INTERFACE_CLASS interface_class_get()
7const Efl_Class *interface_class_get(void); 7const Efl_Class *interface_class_get(void);
diff --git a/src/tests/eo/interface/interface_interface2.h b/src/tests/eo/interface/interface_interface2.h
index c64089b43b..f4d29a4daa 100644
--- a/src/tests/eo/interface/interface_interface2.h
+++ b/src/tests/eo/interface/interface_interface2.h
@@ -1,7 +1,7 @@
1#ifndef INTERFACE2_H 1#ifndef INTERFACE2_H
2#define INTERFACE2_H 2#define INTERFACE2_H
3 3
4EAPI int interface2_ab_sum_get2(Eo *obj); 4int interface2_ab_sum_get2(Eo *obj);
5 5
6#define INTERFACE2_CLASS interface2_class_get() 6#define INTERFACE2_CLASS interface2_class_get()
7const Efl_Class *interface2_class_get(void); 7const Efl_Class *interface2_class_get(void);
diff --git a/src/tests/eo/interface/interface_simple.h b/src/tests/eo/interface/interface_simple.h
index 03f7f4b22c..23dd21c610 100644
--- a/src/tests/eo/interface/interface_simple.h
+++ b/src/tests/eo/interface/interface_simple.h
@@ -1,10 +1,10 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4EAPI void simple_a_set(Eo *obj, int a); 4void simple_a_set(Eo *obj, int a);
5EAPI int simple_a_get(Eo *obj); 5int simple_a_get(Eo *obj);
6EAPI void simple_b_set(Eo *obj, int b); 6void simple_b_set(Eo *obj, int b);
7EAPI int simple_b_get(Eo *obj); 7int simple_b_get(Eo *obj);
8 8
9#define SIMPLE_CLASS simple_class_get() 9#define SIMPLE_CLASS simple_class_get()
10const Efl_Class *simple_class_get(void); 10const Efl_Class *simple_class_get(void);
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 06bff56d2b..5540d38a1e 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -30,7 +30,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
30 efl_destructor(efl_super(obj, MY_CLASS)); 30 efl_destructor(efl_super(obj, MY_CLASS));
31} 31}
32 32
33EAPI EFL_FUNC_BODY(mixin_ab_sum_get, int, 0); 33EFL_FUNC_BODY(mixin_ab_sum_get, int, 0);
34 34
35static Eina_Bool 35static Eina_Bool
36_class_initializer(Efl_Class *klass) 36_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eo/mixin/mixin_mixin.h b/src/tests/eo/mixin/mixin_mixin.h
index 4d9c4253aa..6e4a5c41fc 100644
--- a/src/tests/eo/mixin/mixin_mixin.h
+++ b/src/tests/eo/mixin/mixin_mixin.h
@@ -1,7 +1,7 @@
1#ifndef MIXIN_H 1#ifndef MIXIN_H
2#define MIXIN_H 2#define MIXIN_H
3 3
4EAPI int mixin_ab_sum_get(Eo *obj); 4int mixin_ab_sum_get(Eo *obj);
5 5
6#define MIXIN_CLASS mixin_class_get() 6#define MIXIN_CLASS mixin_class_get()
7const Efl_Class *mixin_class_get(void); 7const Efl_Class *mixin_class_get(void);
diff --git a/src/tests/eo/mixin/mixin_simple.h b/src/tests/eo/mixin/mixin_simple.h
index 03f7f4b22c..23dd21c610 100644
--- a/src/tests/eo/mixin/mixin_simple.h
+++ b/src/tests/eo/mixin/mixin_simple.h
@@ -1,10 +1,10 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4EAPI void simple_a_set(Eo *obj, int a); 4void simple_a_set(Eo *obj, int a);
5EAPI int simple_a_get(Eo *obj); 5int simple_a_get(Eo *obj);
6EAPI void simple_b_set(Eo *obj, int b); 6void simple_b_set(Eo *obj, int b);
7EAPI int simple_b_get(Eo *obj); 7int simple_b_get(Eo *obj);
8 8
9#define SIMPLE_CLASS simple_class_get() 9#define SIMPLE_CLASS simple_class_get()
10const Efl_Class *simple_class_get(void); 10const Efl_Class *simple_class_get(void);
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 0e016dc550..9f01761a02 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -11,9 +11,9 @@ typedef struct
11 int a; 11 int a;
12} Private_Data; 12} Private_Data;
13 13
14EAPI const Efl_Event_Description _EV_A_CHANGED = 14const Efl_Event_Description _EV_A_CHANGED =
15 EFL_EVENT_DESCRIPTION("a,changed"); 15 EFL_EVENT_DESCRIPTION("a,changed");
16EAPI const Efl_Event_Description _EV_RESTART = 16const Efl_Event_Description _EV_RESTART =
17 EFL_EVENT_DESCRIPTION_RESTART("restart"); 17 EFL_EVENT_DESCRIPTION_RESTART("restart");
18 18
19#define MY_CLASS SIMPLE_CLASS 19#define MY_CLASS SIMPLE_CLASS
@@ -69,7 +69,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
69 return obj; 69 return obj;
70} 70}
71 71
72EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); 72EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
73 73
74static Eina_Bool 74static Eina_Bool
75_class_initializer(Efl_Class *klass) 75_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eo/signals/signals_simple.h b/src/tests/eo/signals/signals_simple.h
index d6a79aea10..02ffe51452 100644
--- a/src/tests/eo/signals/signals_simple.h
+++ b/src/tests/eo/signals/signals_simple.h
@@ -6,7 +6,7 @@ typedef struct
6 int cb_count; 6 int cb_count;
7} Simple_Public_Data; 7} Simple_Public_Data;
8 8
9EAPI void simple_a_set(Eo *obj, int a); 9void simple_a_set(Eo *obj, int a);
10 10
11extern const Efl_Event_Description _EV_A_CHANGED; 11extern const Efl_Event_Description _EV_A_CHANGED;
12#define EV_A_CHANGED (&(_EV_A_CHANGED)) 12#define EV_A_CHANGED (&(_EV_A_CHANGED))
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index 7981ad598a..c59b7c8e06 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -72,7 +72,7 @@ test_func(void)
72 72
73//implementation of the test function 73//implementation of the test function
74 74
75EAPI void simple_error_test(Eo *obj); 75void simple_error_test(Eo *obj);
76EFL_VOID_FUNC_BODY_FALLBACK(simple_error_test, test_func();); 76EFL_VOID_FUNC_BODY_FALLBACK(simple_error_test, test_func(););
77static void 77static void
78_test(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 78_test(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 90449c6853..f6788afca6 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -7,10 +7,10 @@
7 7
8#define MY_CLASS SIMPLE_CLASS 8#define MY_CLASS SIMPLE_CLASS
9 9
10EAPI const Efl_Event_Description _EV_A_CHANGED = 10const Efl_Event_Description _EV_A_CHANGED =
11 EFL_EVENT_DESCRIPTION("a,changed"); 11 EFL_EVENT_DESCRIPTION("a,changed");
12 12
13EAPI const Efl_Event_Description _EV_A_CHANGED2 = 13const Efl_Event_Description _EV_A_CHANGED2 =
14 EFL_EVENT_DESCRIPTION("a,changed"); 14 EFL_EVENT_DESCRIPTION("a,changed");
15 15
16static void 16static void
diff --git a/src/tests/eo/suite/eo_test_class_simple.h b/src/tests/eo/suite/eo_test_class_simple.h
index b438b14d97..f7408e9199 100644
--- a/src/tests/eo/suite/eo_test_class_simple.h
+++ b/src/tests/eo/suite/eo_test_class_simple.h
@@ -6,14 +6,14 @@ typedef struct
6 int a; 6 int a;
7} Simple_Public_Data; 7} Simple_Public_Data;
8 8
9EAPI void simple_a_set(Eo *obj, int a); 9void simple_a_set(Eo *obj, int a);
10EAPI int simple_a_get(const Eo *obj); 10int simple_a_get(const Eo *obj);
11EAPI Eina_Bool simple_a_print(Eo *obj); 11Eina_Bool simple_a_print(Eo *obj);
12EAPI Eina_Bool simple_class_hi_print(const Eo *obj); 12Eina_Bool simple_class_hi_print(const Eo *obj);
13EAPI void simple_recursive(Eo *obj, int n); 13void simple_recursive(Eo *obj, int n);
14EAPI void simple_pure_virtual(Eo *obj); 14void simple_pure_virtual(Eo *obj);
15EAPI void simple_no_implementation(Eo *obj); 15void simple_no_implementation(Eo *obj);
16EAPI Eo *simple_part_get(Eo *obj, const char *name); 16Eo *simple_part_get(Eo *obj, const char *name);
17 17
18extern const Efl_Event_Description _EV_A_CHANGED; 18extern const Efl_Event_Description _EV_A_CHANGED;
19#define EV_A_CHANGED (&(_EV_A_CHANGED)) 19#define EV_A_CHANGED (&(_EV_A_CHANGED))
diff --git a/src/tests/eo/suite/eo_test_domain.c b/src/tests/eo/suite/eo_test_domain.c
index 114f57060d..4adba195a6 100644
--- a/src/tests/eo/suite/eo_test_domain.c
+++ b/src/tests/eo/suite/eo_test_domain.c
@@ -8,7 +8,7 @@
8 8
9#define MY_CLASS DOMAIN_CLASS 9#define MY_CLASS DOMAIN_CLASS
10 10
11EAPI const Efl_Event_Description _EV_DOMAIN_A_CHANGED = 11const Efl_Event_Description _EV_DOMAIN_A_CHANGED =
12 EFL_EVENT_DESCRIPTION("domain,a,changed"); 12 EFL_EVENT_DESCRIPTION("domain,a,changed");
13 13
14static void 14static void
diff --git a/src/tests/eo/suite/eo_test_domain.h b/src/tests/eo/suite/eo_test_domain.h
index ac7428534a..356b386767 100644
--- a/src/tests/eo/suite/eo_test_domain.h
+++ b/src/tests/eo/suite/eo_test_domain.h
@@ -6,9 +6,9 @@ typedef struct
6 int a; 6 int a;
7} Domain_Public_Data; 7} Domain_Public_Data;
8 8
9EAPI void domain_a_set(Eo *obj, int a); 9void domain_a_set(Eo *obj, int a);
10EAPI int domain_a_get(Eo *obj); 10int domain_a_get(Eo *obj);
11EAPI void domain_recursive(Eo *obj, int n); 11void domain_recursive(Eo *obj, int n);
12 12
13extern const Efl_Event_Description _EV_DOMAIN_A_CHANGED; 13extern const Efl_Event_Description _EV_DOMAIN_A_CHANGED;
14#define EV_DOMAIN_A_CHANGED (&(_EV_DOMAIN_A_CHANGED)) 14#define EV_DOMAIN_A_CHANGED (&(_EV_DOMAIN_A_CHANGED))
diff --git a/src/tests/eo/suite/eo_test_event.c b/src/tests/eo/suite/eo_test_event.c
index 9148f64363..bde38d4b7e 100644
--- a/src/tests/eo/suite/eo_test_event.c
+++ b/src/tests/eo/suite/eo_test_event.c
@@ -11,11 +11,11 @@
11 11
12//Class definition with one event 12//Class definition with one event
13 13
14EWAPI const Efl_Class *efl_test_event_class_get(void) EINA_CONST; 14EO_API_WEAK const Efl_Class *efl_test_event_class_get(void) EINA_CONST;
15 15
16EWAPI extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER; 16EO_API_WEAK extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER;
17EWAPI extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE; 17EO_API_WEAK extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE;
18EWAPI extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_CLAMP_TEST; 18EO_API_WEAK extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_CLAMP_TEST;
19 19
20#define EFL_TEST_EVENT_EVENT_TESTER (&(_EFL_TEST_EVENT_EVENT_TESTER)) 20#define EFL_TEST_EVENT_EVENT_TESTER (&(_EFL_TEST_EVENT_EVENT_TESTER))
21#define EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE (&(_EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE)) 21#define EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE (&(_EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE))
@@ -232,13 +232,13 @@ void eo_test_event(TCase *tc)
232 232
233//class implementation 233//class implementation
234 234
235EWAPI const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER = 235EO_API_WEAK const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER =
236 EFL_EVENT_DESCRIPTION("tester"); 236 EFL_EVENT_DESCRIPTION("tester");
237 237
238EWAPI const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE = 238EO_API_WEAK const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE =
239 EFL_EVENT_DESCRIPTION("tester"); 239 EFL_EVENT_DESCRIPTION("tester");
240 240
241EWAPI const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_CLAMP_TEST = 241EO_API_WEAK const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_CLAMP_TEST =
242 EFL_EVENT_DESCRIPTION("tester"); 242 EFL_EVENT_DESCRIPTION("tester");
243 243
244 244
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index ae026a27f4..55c93cb9da 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -66,7 +66,7 @@ _simple_obj_override_a_double_set(Eo *obj, void *class_data EINA_UNUSED, int a)
66 simple_a_set(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a); 66 simple_a_set(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a);
67} 67}
68 68
69EAPI int test_class_beef_get(const Efl_Object *obj); 69int test_class_beef_get(const Efl_Object *obj);
70 70
71EFL_FUNC_BODY_CONST(test_class_beef_get, int, 0) 71EFL_FUNC_BODY_CONST(test_class_beef_get, int, 0)
72 72
diff --git a/src/tests/eo/suite/eo_test_reflection_complex_class_structure.c b/src/tests/eo/suite/eo_test_reflection_complex_class_structure.c
index 19727ca879..ecdcccc962 100644
--- a/src/tests/eo/suite/eo_test_reflection_complex_class_structure.c
+++ b/src/tests/eo/suite/eo_test_reflection_complex_class_structure.c
@@ -90,7 +90,7 @@ __eolian_complex_interface_i_test_set_reflect(Eo *obj, Eina_Value val)
90 return r; 90 return r;
91} 91}
92 92
93EOAPI EFL_VOID_FUNC_BODYV(complex_interface_i_test_set, EFL_FUNC_CALL(i), int i); 93EFL_VOID_FUNC_BODYV(complex_interface_i_test_set, EFL_FUNC_CALL(i), int i);
94 94
95static Eina_Value 95static Eina_Value
96__eolian_complex_interface_i_test_get_reflect(const Eo *obj) 96__eolian_complex_interface_i_test_get_reflect(const Eo *obj)
@@ -99,7 +99,7 @@ __eolian_complex_interface_i_test_get_reflect(const Eo *obj)
99 return eina_value_int_init(val); 99 return eina_value_int_init(val);
100} 100}
101 101
102EOAPI EFL_FUNC_BODY_CONST(complex_interface_i_test_get, int, 0); 102EFL_FUNC_BODY_CONST(complex_interface_i_test_get, int, 0);
103 103
104static Eina_Bool 104static Eina_Bool
105_complex_interface_class_initializer(Efl_Class *klass) 105_complex_interface_class_initializer(Efl_Class *klass)
@@ -157,7 +157,7 @@ __eolian_complex_mixin_m_test_set_reflect(Eo *obj, Eina_Value val)
157 return r; 157 return r;
158} 158}
159 159
160EOAPI EFL_VOID_FUNC_BODYV(complex_mixin_m_test_set, EFL_FUNC_CALL(i), int i); 160EFL_VOID_FUNC_BODYV(complex_mixin_m_test_set, EFL_FUNC_CALL(i), int i);
161 161
162 162
163static Eina_Value 163static Eina_Value
@@ -167,7 +167,7 @@ __eolian_complex_mixin_m_test_get_reflect(const Eo *obj)
167 return eina_value_int_init(val); 167 return eina_value_int_init(val);
168} 168}
169 169
170EOAPI EFL_FUNC_BODY_CONST(complex_mixin_m_test_get, int, 0); 170EFL_FUNC_BODY_CONST(complex_mixin_m_test_get, int, 0);
171 171
172static Eina_Bool 172static Eina_Bool
173_complex_mixin_class_initializer(Efl_Class *klass) 173_complex_mixin_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eo/suite/eo_test_reflection_complex_class_structure.h b/src/tests/eo/suite/eo_test_reflection_complex_class_structure.h
index df3136e9b1..969091f5a8 100644
--- a/src/tests/eo/suite/eo_test_reflection_complex_class_structure.h
+++ b/src/tests/eo/suite/eo_test_reflection_complex_class_structure.h
@@ -3,18 +3,18 @@
3 3
4typedef Eo Complex_Mixin; 4typedef Eo Complex_Mixin;
5#define COMPLEX_MIXIN_MIXIN complex_mixin_mixin_get() 5#define COMPLEX_MIXIN_MIXIN complex_mixin_mixin_get()
6EWAPI const Efl_Class *complex_mixin_mixin_get(void) EINA_CONST; 6const Efl_Class *complex_mixin_mixin_get(void) EINA_CONST;
7EOAPI void complex_mixin_m_test_set(Eo *obj, int i); 7void complex_mixin_m_test_set(Eo *obj, int i);
8EOAPI int complex_mixin_m_test_get(const Eo *obj); 8int complex_mixin_m_test_get(const Eo *obj);
9 9
10typedef Eo Complex_Interface; 10typedef Eo Complex_Interface;
11#define COMPLEX_INTERFACE_INTERFACE complex_interface_interface_get() 11#define COMPLEX_INTERFACE_INTERFACE complex_interface_interface_get()
12EWAPI const Efl_Class *complex_interface_interface_get(void) EINA_CONST; 12const Efl_Class *complex_interface_interface_get(void) EINA_CONST;
13EOAPI void complex_interface_i_test_set(Eo *obj, int i); 13void complex_interface_i_test_set(Eo *obj, int i);
14EOAPI int complex_interface_i_test_get(const Eo *obj); 14int complex_interface_i_test_get(const Eo *obj);
15 15
16typedef Eo Complex_Class; 16typedef Eo Complex_Class;
17#define COMPLEX_CLASS_CLASS complex_class_class_get() 17#define COMPLEX_CLASS_CLASS complex_class_class_get()
18EWAPI const Efl_Class *complex_class_class_get(void) EINA_CONST; 18const Efl_Class *complex_class_class_get(void) EINA_CONST;
19 19
20#endif 20#endif
diff --git a/src/tests/eolian_cxx/a.c b/src/tests/eolian_cxx/a.c
index 4fa7af7849..8039d58b5d 100644
--- a/src/tests/eolian_cxx/a.c
+++ b/src/tests/eolian_cxx/a.c
@@ -4,6 +4,9 @@
4 4
5#include <Eo.h> 5#include <Eo.h>
6 6
7#define EOLIANCXXTEST_API
8#define EOLIANCXXTEST_API_WEAK
9
7#include "a.eo.h" 10#include "a.eo.h"
8 11
9struct _A_Data 12struct _A_Data
diff --git a/src/tests/eolian_cxx/b.c b/src/tests/eolian_cxx/b.c
index 2ff548f70d..61cf67a3da 100644
--- a/src/tests/eolian_cxx/b.c
+++ b/src/tests/eolian_cxx/b.c
@@ -4,6 +4,9 @@
4 4
5#include <Eo.h> 5#include <Eo.h>
6 6
7#define EOLIANCXXTEST_API
8#define EOLIANCXXTEST_API_WEAK
9
7#include "a.eo.h" 10#include "a.eo.h"
8#include "b.eo.h" 11#include "b.eo.h"
9 12
diff --git a/src/tests/eolian_cxx/c.c b/src/tests/eolian_cxx/c.c
index 45c3e0af66..ba7b45bc88 100644
--- a/src/tests/eolian_cxx/c.c
+++ b/src/tests/eolian_cxx/c.c
@@ -4,6 +4,9 @@
4 4
5#include <Eo.h> 5#include <Eo.h>
6 6
7#define EOLIANCXXTEST_API
8#define EOLIANCXXTEST_API_WEAK
9
7#include "a.eo.h" 10#include "a.eo.h"
8#include "b.eo.h" 11#include "b.eo.h"
9#include "c.eo.h" 12#include "c.eo.h"
diff --git a/src/tests/eolian_cxx/complex.c b/src/tests/eolian_cxx/complex.c
index 76db444a74..e30c8cb343 100644
--- a/src/tests/eolian_cxx/complex.c
+++ b/src/tests/eolian_cxx/complex.c
@@ -9,6 +9,9 @@
9struct Complex_Data {}; 9struct Complex_Data {};
10typedef struct Complex_Data Complex_Data; 10typedef struct Complex_Data Complex_Data;
11 11
12#define EOLIANCXXTEST_API
13#define EOLIANCXXTEST_API_WEAK
14
12#include "complex.eo.h" 15#include "complex.eo.h"
13 16
14EOLIAN static void 17EOLIAN static void
diff --git a/src/tests/eolian_cxx/complex_cxx.cc b/src/tests/eolian_cxx/complex_cxx.cc
index 8d73fb87d5..7df39152f5 100644
--- a/src/tests/eolian_cxx/complex_cxx.cc
+++ b/src/tests/eolian_cxx/complex_cxx.cc
@@ -21,6 +21,9 @@
21#include <Eina.h> 21#include <Eina.h>
22#include <Eo.h> 22#include <Eo.h>
23 23
24#define EOLIANCXXTEST_API
25#define EOLIANCXXTEST_API_WEAK
26
24#include "complex.eo.h" 27#include "complex.eo.h"
25#include "complex.eo.hh" 28#include "complex.eo.hh"
26 29
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc b/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc
index 9b108a1b4b..6665f1af3f 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc
@@ -19,6 +19,9 @@
19 19
20#include <Eo.hh> 20#include <Eo.hh>
21 21
22#define EOLIANCXXTEST_API
23#define EOLIANCXXTEST_API_WEAK
24
22#include <a.eo.hh> 25#include <a.eo.hh>
23#include <b.eo.hh> 26#include <b.eo.hh>
24#include <c.eo.hh> 27#include <c.eo.hh>
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_binding.cc b/src/tests/eolian_cxx/eolian_cxx_test_binding.cc
index 98020bf919..47a4e9c49c 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_binding.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_binding.cc
@@ -22,6 +22,9 @@
22#include <map> 22#include <map>
23 23
24#define GENERIC_BETA 24#define GENERIC_BETA
25#define EOLIANCXXTEST_API
26#define EOLIANCXXTEST_API_WEAK
27
25#include <generic.eo.hh> 28#include <generic.eo.hh>
26#include <generic.eo.impl.hh> 29#include <generic.eo.impl.hh>
27#include <name1_name2_type_generation.eo.hh> 30#include <name1_name2_type_generation.eo.hh>
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc b/src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc
index 28c5ebd485..158728d4f3 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc
@@ -24,6 +24,9 @@ typedef Eo Cyclic1;
24typedef Eo Cyclic2; 24typedef Eo Cyclic2;
25} 25}
26 26
27#define EOLIANCXXTEST_API
28#define EOLIANCXXTEST_API_WEAK
29
27#include <cyclic1.eo.h> 30#include <cyclic1.eo.h>
28#include <cyclic2.eo.h> 31#include <cyclic2.eo.h>
29#include <cyclic1.eo.hh> 32#include <cyclic1.eo.hh>
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc b/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc
index a39d597659..19a53925dd 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc
@@ -20,6 +20,9 @@
20#include <Eo.h> 20#include <Eo.h>
21#include <Ecore.h> 21#include <Ecore.h>
22 22
23#define EOLIANCXXTEST_API
24#define EOLIANCXXTEST_API_WEAK
25
23#include <simple.eo.hh> 26#include <simple.eo.hh>
24 27
25#include "eolian_cxx_suite.h" 28#include "eolian_cxx_suite.h"
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc b/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc
index 16fc984db4..e1d585cfab 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc
@@ -20,6 +20,9 @@
20#include <Eo.h> 20#include <Eo.h>
21#include <Ecore.h> 21#include <Ecore.h>
22 22
23#define EOLIANCXXTEST_API
24#define EOLIANCXXTEST_API_WEAK
25
23#include <a.eo.hh> 26#include <a.eo.hh>
24 27
25#include "eolian_cxx_suite.h" 28#include "eolian_cxx_suite.h"
diff --git a/src/tests/eolian_cxx/generic.c b/src/tests/eolian_cxx/generic.c
index 78b22e5519..dd337f0516 100644
--- a/src/tests/eolian_cxx/generic.c
+++ b/src/tests/eolian_cxx/generic.c
@@ -8,6 +8,9 @@
8#define GENERIC_BETA 8#define GENERIC_BETA
9#define GENERIC_PROTECTED 9#define GENERIC_PROTECTED
10 10
11#define EOLIANCXXTEST_API
12#define EOLIANCXXTEST_API_WEAK
13
11#include "generic.eo.h" 14#include "generic.eo.h"
12#include "generic_interface.eo.h" 15#include "generic_interface.eo.h"
13 16
diff --git a/src/tests/eolian_cxx/meson.build b/src/tests/eolian_cxx/meson.build
index 23b2727eaf..9e0fbb366e 100644
--- a/src/tests/eolian_cxx/meson.build
+++ b/src/tests/eolian_cxx/meson.build
@@ -55,6 +55,7 @@ foreach eo_file : pub_eo_files
55 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, 55 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
56 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 56 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
57 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 57 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
58 '-e', 'EOLIANCXXTEST_API',
58 '-gch', '@INPUT@']) 59 '-gch', '@INPUT@'])
59endforeach 60endforeach
60 61
diff --git a/src/tests/eolian_cxx/name1_name2_type_generation.c b/src/tests/eolian_cxx/name1_name2_type_generation.c
index 9b03b36237..2d06a5f55e 100644
--- a/src/tests/eolian_cxx/name1_name2_type_generation.c
+++ b/src/tests/eolian_cxx/name1_name2_type_generation.c
@@ -14,6 +14,9 @@ typedef struct _Type_Generation_Data Type_Generation_Data;
14 14
15#define MY_CLASS TYPE1_TYPE2_TYPE_GENERATION_CLASS 15#define MY_CLASS TYPE1_TYPE2_TYPE_GENERATION_CLASS
16 16
17#define EOLIANCXXTEST_API
18#define EOLIANCXXTEST_API_WEAK
19
17#include "name1_name2_type_generation.eo.h" 20#include "name1_name2_type_generation.eo.h"
18 21
19void _name1_name2_type_generation_invoidptr(Eo *obj EINA_UNUSED, Type_Generation_Data *pd EINA_UNUSED, void *v) 22void _name1_name2_type_generation_invoidptr(Eo *obj EINA_UNUSED, Type_Generation_Data *pd EINA_UNUSED, void *v)
diff --git a/src/tests/eolian_cxx/name_name.c b/src/tests/eolian_cxx/name_name.c
index 89f9a73844..0515225e22 100644
--- a/src/tests/eolian_cxx/name_name.c
+++ b/src/tests/eolian_cxx/name_name.c
@@ -11,6 +11,9 @@ typedef struct Ns_Name_Data Ns_Name_Data;
11struct Ns_Name_Other_Data {}; 11struct Ns_Name_Other_Data {};
12typedef struct Ns_Name_Other_Data Ns_Name_Other_Data; 12typedef struct Ns_Name_Other_Data Ns_Name_Other_Data;
13 13
14#define EOLIANCXXTEST_API
15#define EOLIANCXXTEST_API_WEAK
16
14#include "name_name.eo.h" 17#include "name_name.eo.h"
15#include "name_name.eo.c" 18#include "name_name.eo.c"
16#include "ns_name.eo.h" 19#include "ns_name.eo.h"
diff --git a/src/tests/eolian_cxx/name_name_cxx.cc b/src/tests/eolian_cxx/name_name_cxx.cc
index 00e1d13666..f0d9740b7d 100644
--- a/src/tests/eolian_cxx/name_name_cxx.cc
+++ b/src/tests/eolian_cxx/name_name_cxx.cc
@@ -20,6 +20,9 @@
20 20
21#include <Eo.h> 21#include <Eo.h>
22 22
23#define EOLIANCXXTEST_API
24#define EOLIANCXXTEST_API_WEAK
25
23#include "name_name.eo.h" 26#include "name_name.eo.h"
24#include "name_name.eo.hh" 27#include "name_name.eo.hh"
25#include "ns_name.eo.h" 28#include "ns_name.eo.h"
diff --git a/src/tests/eolian_cxx/simple.c b/src/tests/eolian_cxx/simple.c
index 7ab18dcb55..7b7d630eca 100644
--- a/src/tests/eolian_cxx/simple.c
+++ b/src/tests/eolian_cxx/simple.c
@@ -7,6 +7,9 @@
7#include <Eo.h> 7#include <Eo.h>
8#include <Ecore.h> 8#include <Ecore.h>
9 9
10#define EOLIANCXXTEST_API
11#define EOLIANCXXTEST_API_WEAK
12
10#include "simple.eo.h" 13#include "simple.eo.h"
11 14
12#define MY_CLASS SIMPLE_CLASS 15#define MY_CLASS SIMPLE_CLASS