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 @@ #include #include -#ifdef EAPI -# undef EAPI +#ifdef EO_API +#error EO_API should not be already defined #endif #define EOLIAN #ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) +# ifndef EO_STATIC +# ifdef EO_BUILD +# define EO_API __declspec(dllexport) # else -# define EAPI +# define EO_API __declspec(dllimport) # endif # else -# define EAPI __declspec(dllimport) +# define EO_API # endif -# define EAPI_WEAK +# define EO_API_WEAK #else # ifdef __GNUC__ # if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# define EAPI_WEAK __attribute__ ((weak)) +# define EO_API __attribute__ ((visibility("default"))) +# define EO_API_WEAK __attribute__ ((weak)) # else -# define EAPI -# define EAPI_WEAK +# define EO_API +# define EO_API_WEAK # endif # else -# define EAPI -# define EAPI_WEAK +# define EO_API +# define EO_API_WEAK # endif #endif -/* When used, this indicates that the function is an Eo API. */ -#define EOAPI EAPI EAPI_WEAK - #ifdef __cplusplus extern "C" { #endif @@ -191,7 +188,7 @@ typedef Eo Efl_Object; * Don't touch it if you don't know what you are doing. * @internal */ -EAPI extern Eina_Lock _efl_class_creation_lock; +EO_API extern Eina_Lock _efl_class_creation_lock; /** * @var _efl_object_init_generation @@ -200,7 +197,7 @@ EAPI extern Eina_Lock _efl_class_creation_lock; * every call to shutdown that actually shuts down eo. * @internal */ -EAPI extern unsigned int _efl_object_init_generation; +EO_API extern unsigned int _efl_object_init_generation; /** * @typedef Efl_Del_Intercept @@ -301,7 +298,7 @@ typedef struct _Efl_Callback_Array_Item_Full * * @return Return @c true when the callback has been successfully added. */ -EOAPI 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); +EO_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); /** * @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 * * @return Return @c true when the callback has been successfully removed. */ -EOAPI Eina_Bool efl_event_callback_del(Eo *obj, const Efl_Event_Description *desc, Efl_Event_Cb func, const void *user_data); +EO_API Eina_Bool efl_event_callback_del(Eo *obj, const Efl_Event_Description *desc, Efl_Event_Cb func, const void *user_data); /** * @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 * * @note You must use EFL_SCHEDULER_ARRAY_DEFINE() to create the @p array. */ -EOAPI Eina_Future_Scheduler *efl_event_future_scheduler_get(const Eo *obj, Efl_Callback_Array_Item *array); +EO_API Eina_Future_Scheduler *efl_event_future_scheduler_get(const Eo *obj, Efl_Callback_Array_Item *array); /** * @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 * * @return Return @c true when the callback has been successfully added. */ -EOAPI Eina_Bool efl_event_callback_array_priority_add(Eo *obj, const Efl_Callback_Array_Item *array, Efl_Callback_Priority priority, const void *data); +EO_API Eina_Bool efl_event_callback_array_priority_add(Eo *obj, const Efl_Callback_Array_Item *array, Efl_Callback_Priority priority, const void *data); /** * @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 * * @return Return @c true when the callback has been successfully removed. */ -EOAPI Eina_Bool efl_event_callback_array_del(Eo *obj, const Efl_Callback_Array_Item *array, const void *user_data); +EO_API Eina_Bool efl_event_callback_array_del(Eo *obj, const Efl_Callback_Array_Item *array, const void *user_data); /** * @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 * * @return @c false If one of the callbacks aborted the call, @c true otherwise */ -EOAPI Eina_Bool efl_event_callback_call(Eo *obj, const Efl_Event_Description *desc, void *event_info); +EO_API Eina_Bool efl_event_callback_call(Eo *obj, const Efl_Event_Description *desc, void *event_info); /** * @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 * * @since 1.19 */ -EOAPI Eina_Bool efl_event_callback_legacy_call(Eo *obj, const Efl_Event_Description *desc, void *event_info); +EO_API Eina_Bool efl_event_callback_legacy_call(Eo *obj, const Efl_Event_Description *desc, void *event_info); /** @@ -578,7 +575,7 @@ typedef struct _Efl_Future_Cb_Desc { * @see #Efl_Future_Cb_Desc * @see efl_key_data_set() */ -EOAPI Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_Cb_Desc desc) EINA_ARG_NONNULL(1); +EO_API Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_Cb_Desc desc) EINA_ARG_NONNULL(1); /** * 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 * @see eina_future_then_from_desc() * @see #Efl_Future_Cb_Desc */ -EOAPI Eina_Future *efl_future_chain_array(Eo *obj, Eina_Future *prev, const Efl_Future_Cb_Desc descs[]) EINA_ARG_NONNULL(1, 2); +EO_API Eina_Future *efl_future_chain_array(Eo *obj, Eina_Future *prev, const Efl_Future_Cb_Desc descs[]) EINA_ARG_NONNULL(1, 2); /** * Syntax suger over efl_future_chain_array() @@ -659,13 +656,13 @@ typedef struct _Efl_Dbg_Info * * @param[in] root_node the tree Node */ -EOAPI void efl_dbg_info_get(Eo *obj, Efl_Dbg_Info *root_node); +EO_API void efl_dbg_info_get(Eo *obj, Efl_Dbg_Info *root_node); /** * @var EFL_DBG_INFO_TYPE * The Eina_Value_Type for the debug info. */ -EAPI extern const Eina_Value_Type *EFL_DBG_INFO_TYPE; +EO_API extern const Eina_Value_Type *EFL_DBG_INFO_TYPE; /** * Creates a list inside debug info list. @@ -715,7 +712,7 @@ do { \ * Frees the Efl_Dbg_Info tree. (The whole tree recursively). * @param[in] info The tree to delete. */ -EAPI void efl_dbg_info_free(Efl_Dbg_Info *info); +EO_API void efl_dbg_info_free(Efl_Dbg_Info *info); /** * @} @@ -850,7 +847,7 @@ typedef enum _Efl_Class_Type Efl_Class_Type; typedef struct _Efl_Op_Description { - void *api_func; /**< The EAPI function offering this op. (The name of the func on windows) */ + void *api_func; /**< The EO_API function offering this op. (The name of the func on windows) */ void *func; /**< The static function to call for the op. */ } Efl_Op_Description; @@ -937,7 +934,7 @@ typedef struct _Efl_Class_Description Efl_Class_Description; * * @see #EFL_DEFINE_CLASS */ -EAPI const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent, ...); +EO_API const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent, ...); /** * @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 * efl_property_reflection_set() or efl_property_reflection_get() is called. * @see #EFL_DEFINE_CLASS */ -EAPI 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); +EO_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); /** * @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 * * @see EFL_OPS_DEFINE */ -EAPI Eina_Bool efl_object_override(Eo *obj, const Efl_Object_Ops *ops); +EO_API Eina_Bool efl_object_override(Eo *obj, const Efl_Object_Ops *ops); /** * @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); * Note: that an Efl_Class is also an Efl_Object, so if you pass an Efl_Class * as obj, it will check if that class contain klass. */ -EAPI Eina_Bool efl_isa(const Eo *obj, const Efl_Class *klass); +EO_API Eina_Bool efl_isa(const Eo *obj, const Efl_Class *klass); /** * @brief Gets the name of the passed class. @@ -1016,7 +1013,7 @@ EAPI Eina_Bool efl_isa(const Eo *obj, const Efl_Class *klass); * * @see efl_class_get() */ -EAPI const char *efl_class_name_get(const Efl_Class *klass); +EO_API const char *efl_class_name_get(const Efl_Class *klass); /** * @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); * * @see efl_class_get() */ -EAPI size_t efl_class_memory_size_get(const Efl_Class *klass); +EO_API size_t efl_class_memory_size_get(const Efl_Class *klass); /** * @brief Gets a debug name for this object @@ -1042,7 +1039,7 @@ EAPI size_t efl_class_memory_size_get(const Efl_Class *klass); * * @since 1.21 */ -EAPI const char *efl_debug_name_get(const Eo *obj_id); +EO_API const char *efl_debug_name_get(const Eo *obj_id); /** * @} @@ -1054,7 +1051,7 @@ EAPI const char *efl_debug_name_get(const Eo *obj_id); * * @see eo_shutdown() */ -EAPI Eina_Bool efl_object_init(void); +EO_API Eina_Bool efl_object_init(void); /** * @brief Shutdown the eo subsystem @@ -1062,7 +1059,7 @@ EAPI Eina_Bool efl_object_init(void); * * @see efl_object_init() */ -EAPI Eina_Bool efl_object_shutdown(void); +EO_API Eina_Bool efl_object_shutdown(void); #ifdef EFL_BETA_API_SUPPORT @@ -1110,7 +1107,7 @@ typedef struct _Efl_Domain_Data Efl_Domain_Data; * @see efl_domain_data_return() * @see efl_compatible() */ -EAPI Efl_Id_Domain efl_domain_get(void); +EO_API Efl_Id_Domain efl_domain_get(void); /** * @brief Switch the native domain for the current thread. @@ -1125,7 +1122,7 @@ EAPI Efl_Id_Domain efl_domain_get(void); * * @see efl_domain_get() */ -EAPI Eina_Bool efl_domain_switch(Efl_Id_Domain domain); +EO_API Eina_Bool efl_domain_switch(Efl_Id_Domain domain); /** * @brief Get the current domain used for allocating new objects @@ -1138,7 +1135,7 @@ EAPI Eina_Bool efl_domain_switch(Efl_Id_Domain domain); * * @see efl_domain_get() */ -EAPI Efl_Id_Domain efl_domain_current_get(void); +EO_API Efl_Id_Domain efl_domain_current_get(void); /** * @brief Set the current domain used for allocating new objects. @@ -1152,7 +1149,7 @@ EAPI Efl_Id_Domain efl_domain_current_get(void); * * @see efl_domain_get() */ -EAPI Eina_Bool efl_domain_current_set(Efl_Id_Domain domain); +EO_API Eina_Bool efl_domain_current_set(Efl_Id_Domain domain); /** * @brief Push a new domain onto the domain stack. @@ -1165,7 +1162,7 @@ EAPI Eina_Bool efl_domain_current_set(Efl_Id_Domain domain); * * @see efl_domain_get() */ -EAPI Eina_Bool efl_domain_current_push(Efl_Id_Domain domain); +EO_API Eina_Bool efl_domain_current_push(Efl_Id_Domain domain); /** * @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); * * @see efl_domain_get() */ -EAPI void efl_domain_current_pop(void); +EO_API void efl_domain_current_pop(void); /** * @brief Get an opaque handle to the local native domain eoid data @@ -1191,7 +1188,7 @@ EAPI void efl_domain_current_pop(void); * * @see efl_domain_get() */ -EAPI Efl_Domain_Data *efl_domain_data_get(void); +EO_API Efl_Domain_Data *efl_domain_data_get(void); /** * @brief Adopt a single extra domain to be the current domain @@ -1214,7 +1211,7 @@ EAPI Efl_Domain_Data *efl_domain_data_get(void); * * @see efl_domain_get() */ -EAPI Efl_Id_Domain efl_domain_data_adopt(Efl_Domain_Data *data_in); +EO_API Efl_Id_Domain efl_domain_data_adopt(Efl_Domain_Data *data_in); /** * @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); * * @see efl_domain_get() */ -EAPI Eina_Bool efl_domain_data_return(Efl_Id_Domain domain); +EO_API Eina_Bool efl_domain_data_return(Efl_Id_Domain domain); /** * @brief Check if 2 objects are compatible @@ -1246,7 +1243,7 @@ EAPI Eina_Bool efl_domain_data_return(Efl_Id_Domain domain); * * @see efl_domain_get() */ -EAPI Eina_Bool efl_compatible(const Eo *obj, const Eo *obj_target); +EO_API Eina_Bool efl_compatible(const Eo *obj, const Eo *obj_target); #endif @@ -1315,7 +1312,7 @@ __##Name##_failed: EINA_COLD; \ #define _EFL_OBJECT_API_AFTER_HOOK #define _EFL_OBJECT_API_CALL_HOOK(x) x -// to define an EAPI function +// to define an EO_API function #define _EFL_OBJECT_FUNC_BODY(Name, ObjType, Ret, DefRet, ErrorCase) \ Ret \ Name(ObjType obj) \ @@ -1406,17 +1403,17 @@ __##Name##_failed: EINA_COLD; \ #define EFL_OBJECT_OP_FUNC(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private } // returns the OP id corresponding to the given api_func -EAPI Efl_Object_Op _efl_object_api_op_id_get(const void *api_func) EINA_DEPRECATED; -EAPI 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; +EO_API Efl_Object_Op _efl_object_api_op_id_get(const void *api_func) EINA_DEPRECATED; +EO_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; // gets the real function pointer and the object data -EAPI 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); +EO_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); // end of the eo call barrier, unref the obj -EAPI void _efl_object_call_end(Efl_Object_Op_Call_Data *call); +EO_API void _efl_object_call_end(Efl_Object_Op_Call_Data *call); // end of the efl_add. Calls finalize among others -EAPI Eo * _efl_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback); +EO_API Eo * _efl_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback); /*****************************************************************************/ @@ -1457,7 +1454,7 @@ EAPI Eo * _efl_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback); * * @see efl_cast */ -EAPI Eo *efl_super(const Eo *obj, const Efl_Class *cur_klass); +EO_API Eo *efl_super(const Eo *obj, const Efl_Class *cur_klass); /** * @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); * * @since 1.20 */ -EAPI Eo *efl_cast(const Eo *obj, const Efl_Class *cur_klass); +EO_API Eo *efl_cast(const Eo *obj, const Efl_Class *cur_klass); /*****************************************************************************/ @@ -1500,9 +1497,9 @@ EAPI Eo *efl_cast(const Eo *obj, const Efl_Class *cur_klass); * * @see efl_class_name_get() */ -EAPI const Efl_Class *efl_class_get(const Eo *obj); +EO_API const Efl_Class *efl_class_get(const Eo *obj); -EAPI Eo *_efl_added_get(void); +EO_API Eo *_efl_added_get(void); /* Check if GCC compatible (both GCC and clang define this) */ #if defined(__GNUC__) && !defined(_EO_ADD_FALLBACK_FORCE) @@ -1590,7 +1587,7 @@ EAPI Eo *_efl_added_get(void); */ #define efl_new(klass, ...) efl_add_ref(klass, NULL, ##__VA_ARGS__) -EAPI Eo * _efl_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback); +EO_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); /** * @typedef Efl_Substitute_Ctor_Cb @@ -1619,7 +1616,7 @@ typedef Eo *(*Efl_Substitute_Ctor_Cb)(void *data, Eo *obj_id); * @param sub_ctor_data Additional data to be passed to the @p substitute_ctor callback. * @return An handle to the new object on success, NULL otherwise. */ -EAPI 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); +EO_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); /** * @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 * * @ingroup Efl_Object */ -EAPI void efl_del(const Eo *obj); +EO_API void efl_del(const Eo *obj); /** * @brief Set an override for a class @@ -1647,7 +1644,7 @@ EAPI void efl_del(const Eo *obj); * * @ingroup Efl_Object */ -EAPI Eina_Bool efl_class_override_register(const Efl_Class *klass, const Efl_Class *override); +EO_API Eina_Bool efl_class_override_register(const Efl_Class *klass, const Efl_Class *override); /** * @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 * * @ingroup Efl_Object */ -EAPI Eina_Bool efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override); +EO_API Eina_Bool efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override); /** * @brief Get a pointer to the data of an object for a specific class. * @@ -1676,7 +1673,7 @@ EAPI Eina_Bool efl_class_override_unregister(const Efl_Class *klass, const Efl_C * @see efl_data_unref() * @see efl_data_scope_safe_get() */ -EAPI void *efl_data_scope_get(const Eo *obj, const Efl_Class *klass); +EO_API void *efl_data_scope_get(const Eo *obj, const Efl_Class *klass); /** * @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); * * @since 1.20 */ -EAPI void *efl_data_scope_safe_get(const Eo *obj, const Efl_Class *klass); +EO_API void *efl_data_scope_safe_get(const Eo *obj, const Efl_Class *klass); /** * @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); * * @see efl_data_xunref_internal() */ -EAPI void *efl_data_xref_internal(const char *file, int line, const Eo *obj, const Efl_Class *klass, const Eo *ref_obj); +EO_API void *efl_data_xref_internal(const char *file, int line, const Eo *obj, const Efl_Class *klass, const Eo *ref_obj); /** * @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 * * @see efl_data_xref_internal() */ -EAPI void efl_data_xunref_internal(const Eo *obj, void *data, const Eo *ref_obj); +EO_API void efl_data_xunref_internal(const Eo *obj, void *data, const Eo *ref_obj); /** * @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) * @see efl_unref() * @see efl_ref_count() */ -EAPI Eo *efl_ref(const Eo *obj); +EO_API Eo *efl_ref(const Eo *obj); /** * @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); * @see efl_ref() * @see efl_ref_count() */ -EAPI void efl_unref(const Eo *obj); +EO_API void efl_unref(const Eo *obj); /** * @brief Return the ref count of the object passed. @@ -1793,7 +1790,7 @@ EAPI void efl_unref(const Eo *obj); * @see efl_ref() * @see efl_unref() */ -EAPI int efl_ref_count(const Eo *obj); +EO_API int efl_ref_count(const Eo *obj); /** * @brief Set a deletion interceptor function. @@ -1824,7 +1821,7 @@ EAPI int efl_ref_count(const Eo *obj); * @see efl_unref() * @see efl_del() */ -EAPI void efl_del_intercept_set(Eo *obj, Efl_Del_Intercept del_intercept_func); +EO_API void efl_del_intercept_set(Eo *obj, Efl_Del_Intercept del_intercept_func); /** * @brief Get the deletion interceptor function @@ -1841,7 +1838,7 @@ EAPI void efl_del_intercept_set(Eo *obj, Efl_Del_Intercept del_intercept_func); * * @see efl_del_intercept_set() */ -EAPI Efl_Del_Intercept efl_del_intercept_get(const Eo *obj); +EO_API Efl_Del_Intercept efl_del_intercept_get(const Eo *obj); /** * @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); * * @see efl_del_intercept_set() */ -EAPI void efl_reuse(const Eo *obj); +EO_API void efl_reuse(const Eo *obj); /** * @def efl_xref(obj, ref_obj) @@ -1875,7 +1872,7 @@ EAPI void efl_reuse(const Eo *obj); * * @see efl_xunref() */ -EAPI Eo *efl_xref_internal(const char *file, int line, Eo *obj, const Eo *ref_obj); +EO_API Eo *efl_xref_internal(const char *file, int line, Eo *obj, const Eo *ref_obj); /** * @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 * * @see efl_xref_internal() */ -EAPI void efl_xunref(Eo *obj, const Eo *ref_obj); +EO_API void efl_xunref(Eo *obj, const Eo *ref_obj); /** * @brief Add a new weak reference to obj. @@ -1900,7 +1897,7 @@ EAPI void efl_xunref(Eo *obj, const Eo *ref_obj); * * @param[in] wref The weak ref */ -EOAPI void efl_wref_add(Eo *obj, Efl_Object **wref); +EO_API void efl_wref_add(Eo *obj, Efl_Object **wref); /** * @brief Delete the weak reference passed. @@ -1909,7 +1906,7 @@ EOAPI void efl_wref_add(Eo *obj, Efl_Object **wref); * * @param[in] wref The weak ref */ -EOAPI void efl_wref_del(Eo *obj, Efl_Object **wref); +EO_API void efl_wref_del(Eo *obj, Efl_Object **wref); /** * @brief Generic data with string key on an object. @@ -1919,7 +1916,7 @@ EOAPI void efl_wref_del(Eo *obj, Efl_Object **wref); * @param[in] key The key associated with the data * @param[in] data The data to set */ -EOAPI void efl_key_data_set(Eo *obj, const char * key, const void *data); +EO_API void efl_key_data_set(Eo *obj, const char * key, const void *data); /** * @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); * * @return The data to set */ -EOAPI void *efl_key_data_get(const Eo *obj, const char * key); +EO_API void *efl_key_data_get(const Eo *obj, const char * key); /** * @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); * @param[in] key The key associated with the object ref * @param[in] objdata The object to set */ -EOAPI void efl_key_ref_set(Eo *obj, const char * key, const Efl_Object *objdata); +EO_API void efl_key_ref_set(Eo *obj, const char * key, const Efl_Object *objdata); /** * @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) * * @return The object to set */ -EOAPI Efl_Object *efl_key_ref_get(const Eo *obj, const char * key); +EO_API Efl_Object *efl_key_ref_get(const Eo *obj, const char * key); /** * @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); * @param[in] key The key associated with the object ref * @param[in] objdata The object to set */ -EOAPI void efl_key_wref_set(Eo *obj, const char * key, const Efl_Object *objdata); +EO_API void efl_key_wref_set(Eo *obj, const char * key, const Efl_Object *objdata); /** * @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 * * @return The object to set */ -EOAPI Efl_Object *efl_key_wref_get(const Eo *obj, const char * key); +EO_API Efl_Object *efl_key_wref_get(const Eo *obj, const char * key); /** * @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); * @param[in] key The key associated with the value * @param[in] value The value to set */ -EOAPI void efl_key_value_set(Eo *obj, const char * key, Eina_Value *value); +EO_API void efl_key_value_set(Eo *obj, const char * key, Eina_Value *value); /** * @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); * * @return The value to set */ -EOAPI Eina_Value *efl_key_value_get(const Eo *obj, const char * key); +EO_API Eina_Value *efl_key_value_get(const Eo *obj, const char * key); /** * @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); * * @see efl_manual_free() */ -EAPI void efl_manual_free_set(Eo *obj, Eina_Bool manual_free); +EO_API void efl_manual_free_set(Eo *obj, Eina_Bool manual_free); /** * @brief Frees the object. @@ -2049,7 +2046,7 @@ EAPI void efl_manual_free_set(Eo *obj, Eina_Bool manual_free); * * @see efl_manual_free_set() */ -EAPI Eina_Bool efl_manual_free(Eo *obj); +EO_API Eina_Bool efl_manual_free(Eo *obj); /** * @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); * * @see efl_manual_free_set() */ -EAPI Eina_Bool efl_destructed_is(const Eo *obj); +EO_API Eina_Bool efl_destructed_is(const Eo *obj); /** * @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); * * @see efl_property_reflection_get() and efl_property_reflection_exist() */ -EAPI Eina_Error efl_property_reflection_set(Eo *obj, const char *property_name, Eina_Value value); +EO_API Eina_Error efl_property_reflection_set(Eo *obj, const char *property_name, Eina_Value value); /** * @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, * * @see efl_property_reflection_set() and efl_property_reflection_exist() */ -EAPI Eina_Value efl_property_reflection_get(const Eo *obj, const char *property_name); +EO_API Eina_Value efl_property_reflection_get(const Eo *obj, const char *property_name); /** * @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_ * * @see efl_property_reflection_set() and efl_property_reflection_get() */ -EAPI Eina_Bool efl_property_reflection_exist(Eo *obj, const char *property_name); +EO_API Eina_Bool efl_property_reflection_exist(Eo *obj, const char *property_name); /** * @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) * * @return The type of this class or INVALID if the klass parameter was invalid. */ -EAPI Efl_Class_Type efl_class_type_get(const Efl_Class *klass); +EO_API Efl_Class_Type efl_class_type_get(const Efl_Class *klass); /** * @} @@ -2174,7 +2171,7 @@ typedef void (*efl_key_data_free_func)(void *); * Helper for sorting callbacks array. Automatically used by * @ref EFL_CALLBACKS_ARRAY_DEFINE */ -EAPI int efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Item *b); +EO_API int efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Item *b); /** * Helper for creating global callback arrays. @@ -2280,7 +2277,7 @@ EAPI int efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_ * * @ingroup Efl_Object */ -EOAPI unsigned int efl_event_callback_count(const Eo *obj, const Efl_Event_Description *desc); +EO_API unsigned int efl_event_callback_count(const Eo *obj, const Efl_Event_Description *desc); /** * @brief Replace the previous Eo pointer with new content. @@ -2314,7 +2311,7 @@ efl_replace(Eo **storage, const Eo *new_obj) return EINA_TRUE; } -EOAPI extern const Eina_Value_Type *EINA_VALUE_TYPE_OBJECT; +EO_API extern const Eina_Value_Type *EINA_VALUE_TYPE_OBJECT; /** * @brief Create a new #Eina_Value containing the passed parameter. @@ -2390,13 +2387,13 @@ efl_alive_get(const Eo *obj) * @brief Event triggered when a callback was added to the object */ #define EFL_EVENT_CALLBACK_ADD (&(_EFL_EVENT_CALLBACK_ADD)) -EAPI extern const Efl_Event_Description _EFL_EVENT_CALLBACK_ADD; +EO_API extern const Efl_Event_Description _EFL_EVENT_CALLBACK_ADD; /** * @brief Event triggered when a callback was removed from the object */ #define EFL_EVENT_CALLBACK_DEL (&(_EFL_EVENT_CALLBACK_DEL)) -EAPI extern const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL; +EO_API extern const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL; /** * @} @@ -2414,7 +2411,7 @@ EAPI extern const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL; * * @return an iterator on success, NULL otherwise */ -EAPI Eina_Iterator *eo_classes_iterator_new(void); +EO_API Eina_Iterator *eo_classes_iterator_new(void); /** * @brief Get an iterator on the Eo objects @@ -2423,7 +2420,7 @@ EAPI Eina_Iterator *eo_classes_iterator_new(void); * * @return an iterator on success, NULL otherwise */ -EAPI Eina_Iterator *eo_objects_iterator_new(void); +EO_API Eina_Iterator *eo_objects_iterator_new(void); /** * @brief Check if a object can be owned @@ -2433,7 +2430,7 @@ EAPI Eina_Iterator *eo_objects_iterator_new(void); * * @return EINA_TRUE if the object is ownable. EINA_FALSE if not. */ -EAPI Eina_Bool efl_ownable_get(const Eo *obj); +EO_API Eina_Bool efl_ownable_get(const Eo *obj); /** * @} @@ -2448,10 +2445,4 @@ EAPI Eina_Bool efl_ownable_get(const Eo *obj); } #endif -#undef EAPI -#define EAPI - -#undef EOAPI -#define EOAPI - #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; #define EFL_OBJECT_OP_IDS_FIRST 1 /* Used inside the class_get functions of classes, see #EFL_DEFINE_CLASS */ -EAPI Eina_Lock _efl_class_creation_lock; -EAPI unsigned int _efl_object_init_generation = 1; +EO_API Eina_Lock _efl_class_creation_lock; +EO_API unsigned int _efl_object_init_generation = 1; int _eo_log_dom = -1; Eina_Thread _efl_object_main_thread; static unsigned int efl_del_api_generation = 0; @@ -524,19 +524,19 @@ err_obj_hierarchy: return NULL; } -EAPI Eo * +EO_API Eo * efl_super(const Eo *eo_id, const Efl_Class *cur_klass) { return _efl_super_cast(eo_id, cur_klass, EINA_TRUE); } -EAPI Eo * +EO_API Eo * efl_cast(const Eo *eo_id, const Efl_Class *cur_klass) { return _efl_super_cast(eo_id, cur_klass, EINA_FALSE); } -EAPI Eina_Bool +EO_API Eina_Bool _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) { const _Efl_Class *klass, *main_klass; @@ -692,7 +692,7 @@ on_null: return EINA_FALSE; } -EAPI void +EO_API void _efl_object_call_end(Efl_Object_Op_Call_Data *call) { if (EINA_LIKELY(!!call->obj)) @@ -735,7 +735,7 @@ _efl_object_api_op_id_get_internal(const void *api_func) } /* LEGACY, should be removed before next release */ -EAPI Efl_Object_Op +EO_API Efl_Object_Op _efl_object_api_op_id_get(const void *api_func) { 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) return op; } -EAPI Efl_Object_Op +EO_API Efl_Object_Op _efl_object_op_api_id_get(const void *api_func, const Eo *eo_obj, const char *api_func_name, const char *file, int line) { Efl_Object_Op op; @@ -886,7 +886,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Cla return EINA_TRUE; } -EAPI Eina_Bool +EO_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) { EO_CLASS_POINTER_GOTO(klass_id, klass, err_klass); @@ -1092,13 +1092,13 @@ err_parent: return NULL; } -EAPI Eo * +EO_API Eo * _efl_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback) { return _efl_add_internal_start_do(file, line, klass_id, parent_id, ref, is_fallback, NULL, NULL); } -EAPI 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) +EO_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) { return _efl_add_internal_start_do(file, line, klass_id, parent_id, ref, is_fallback, substitute_ctor, sub_ctor_data); } @@ -1145,7 +1145,7 @@ cleanup: return NULL; } -EAPI Eo * +EO_API Eo * _efl_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback) { if (!eo_id) return NULL; @@ -1165,7 +1165,7 @@ _efl_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback) return ret; } -EAPI void +EO_API void efl_reuse(const Eo *eo_id) { Eo *obj = (Eo *) eo_id; @@ -1248,7 +1248,7 @@ _eo_free(_Eo_Object *obj, Eina_Bool manual_free EINA_UNUSED) } /*****************************************************************************/ -EAPI const Efl_Class * +EO_API const Efl_Class * efl_class_get(const Eo *eo_id) { const Efl_Class *klass; @@ -1270,7 +1270,7 @@ err_obj: return NULL; } -EAPI const char * +EO_API const char * efl_class_name_get(const Efl_Class *eo_id) { const _Efl_Class *klass; @@ -1294,7 +1294,7 @@ err_obj: return NULL; } -EAPI size_t +EO_API size_t efl_class_memory_size_get(const Efl_Class *eo_id) { const _Efl_Class *klass; @@ -1561,7 +1561,7 @@ _eo_classes_expand(void) _eo_classes = (_Efl_Class **)ptr; } -EAPI const Efl_Class * +EO_API const Efl_Class * efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...) { _Efl_Class *klass; @@ -1807,7 +1807,7 @@ efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ... return _eo_class_id_get(klass); } -EAPI Eina_Bool +EO_API Eina_Bool efl_object_override(Eo *eo_id, const Efl_Object_Ops *ops) { EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE); @@ -1864,7 +1864,7 @@ err: return EINA_FALSE; } -EAPI Eina_Bool +EO_API Eina_Bool efl_isa(const Eo *eo_id, const Efl_Class *klass_id) { Efl_Id_Domain domain; @@ -1979,7 +1979,7 @@ err: EINA_COLD return EINA_FALSE; } -EAPI Eo * +EO_API Eo * efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id) { efl_ref(obj_id); @@ -2004,7 +2004,7 @@ efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id) return obj_id; } -EAPI void +EO_API void efl_xunref(Eo *obj_id, const Eo *ref_obj_id) { EO_OBJ_POINTER_RETURN(obj_id, obj); @@ -2034,7 +2034,7 @@ efl_xunref(Eo *obj_id, const Eo *ref_obj_id) efl_unref(obj_id); } -EAPI Eo * +EO_API Eo * efl_ref(const Eo *obj_id) { EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, (Eo *)obj_id); @@ -2052,7 +2052,7 @@ efl_ref(const Eo *obj_id) return (Eo *)obj_id; } -EAPI void +EO_API void efl_unref(const Eo *obj_id) { EO_OBJ_POINTER_RETURN(obj_id, obj); @@ -2114,7 +2114,7 @@ efl_unref(const Eo *obj_id) EO_OBJ_DONE(obj_id); } -EAPI int +EO_API int efl_ref_count(const Eo *obj_id) { EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, 0); @@ -2124,7 +2124,7 @@ efl_ref_count(const Eo *obj_id) return ref; } -EAPI int +EO_API int ___efl_ref2_count(const Eo *obj_id) { EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, 0); @@ -2134,7 +2134,7 @@ ___efl_ref2_count(const Eo *obj_id) return ref; } -EAPI void +EO_API void ___efl_ref2_reset(const Eo *obj_id) { EO_OBJ_POINTER_RETURN(obj_id, obj); @@ -2143,7 +2143,7 @@ ___efl_ref2_reset(const Eo *obj_id) } -EAPI void +EO_API void efl_del_intercept_set(Eo *obj_id, Efl_Del_Intercept del_intercept_func) { EO_OBJ_POINTER_RETURN(obj_id, obj); @@ -2151,7 +2151,7 @@ efl_del_intercept_set(Eo *obj_id, Efl_Del_Intercept del_intercept_func) EO_OBJ_DONE(obj_id); } -EAPI Efl_Del_Intercept +EO_API Efl_Del_Intercept efl_del_intercept_get(const Eo *obj_id) { Efl_Del_Intercept func; @@ -2282,7 +2282,7 @@ _efl_data_xunref_internal(_Eo_Object *obj EINA_UNUSED, void *data EINA_UNUSED, c #endif } -EAPI void * +EO_API void * efl_data_scope_get(const Eo *obj_id, const Efl_Class *klass_id) { void *ret = NULL; @@ -2310,7 +2310,7 @@ err_klass: return ret; } -EAPI void * +EO_API void * efl_data_scope_safe_get(const Eo *obj_id, const Efl_Class *klass_id) { void *ret = NULL; @@ -2335,7 +2335,7 @@ err_klass: return ret; } -EAPI void * +EO_API void * efl_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_Class *klass_id, const Eo *ref_obj_id) { void *ret = NULL; @@ -2378,7 +2378,7 @@ err: #endif } -EAPI void +EO_API void efl_data_xunref_internal(const Eo *obj_id, void *data, const Eo *ref_obj_id) { EO_OBJ_POINTER_RETURN(obj_id, obj); @@ -2403,7 +2403,7 @@ _eo_table_del_cb(void *in) * This is used by the gdb debug helper script */ Eo_Id_Data *_eo_gdb_main_domain = NULL; -EAPI Eina_Bool +EO_API Eina_Bool efl_object_init(void) { const char *log_dom = "eo"; @@ -2498,7 +2498,7 @@ efl_object_init(void) return efl_klass && efl_object; } -EAPI Eina_Bool +EO_API Eina_Bool efl_object_shutdown(void) { size_t i; @@ -2569,21 +2569,21 @@ efl_object_shutdown(void) } -EAPI Efl_Id_Domain +EO_API Efl_Id_Domain efl_domain_get(void) { Eo_Id_Data *data = _eo_table_data_get(); return data->local_domain; } -EAPI Efl_Id_Domain +EO_API Efl_Id_Domain efl_domain_current_get(void) { Eo_Id_Data *data = _eo_table_data_get(); return data->domain_stack[data->stack_top]; } -EAPI Eina_Bool +EO_API Eina_Bool efl_domain_switch(Efl_Id_Domain domain) { Eo_Id_Data *data = _eo_table_data_get(); @@ -2630,21 +2630,21 @@ _efl_domain_pop(Eo_Id_Data *data) if (data->stack_top > 0) data->stack_top--; } -EAPI Eina_Bool +EO_API Eina_Bool efl_domain_current_push(Efl_Id_Domain domain) { Eo_Id_Data *data = _eo_table_data_get(); return _efl_domain_push(data, domain); } -EAPI void +EO_API void efl_domain_current_pop(void) { Eo_Id_Data *data = _eo_table_data_get(); _efl_domain_pop(data); } -EAPI Eina_Bool +EO_API Eina_Bool efl_domain_current_set(Efl_Id_Domain domain) { Eo_Id_Data *data = _eo_table_data_get(); @@ -2657,14 +2657,14 @@ efl_domain_current_set(Efl_Id_Domain domain) return EINA_TRUE; } -EAPI Efl_Domain_Data * +EO_API Efl_Domain_Data * efl_domain_data_get(void) { Eo_Id_Data *data = _eo_table_data_get(); return (Efl_Domain_Data *)data; } -EAPI Efl_Id_Domain +EO_API Efl_Id_Domain efl_domain_data_adopt(Efl_Domain_Data *data_in) { Eo_Id_Data *data = _eo_table_data_get(); @@ -2692,7 +2692,7 @@ efl_domain_data_adopt(Efl_Domain_Data *data_in) return data->domain_stack[data->stack_top]; } -EAPI Eina_Bool +EO_API Eina_Bool efl_domain_data_return(Efl_Id_Domain domain) { Eo_Id_Data *data = _eo_table_data_get(); @@ -2712,7 +2712,7 @@ efl_domain_data_return(Efl_Id_Domain domain) return EINA_TRUE; } -EAPI Eina_Bool +EO_API Eina_Bool efl_compatible(const Eo *obj, const Eo *obj_target) { Efl_Id_Domain domain1 = ((Eo_Id)obj >> SHIFT_DOMAIN) & MASK_DOMAIN; @@ -2723,7 +2723,7 @@ efl_compatible(const Eo *obj, const Eo *obj_target) return EINA_FALSE; } -EAPI Eina_Bool +EO_API Eina_Bool efl_class_override_register(const Efl_Class *klass, const Efl_Class *override) { 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) return EINA_TRUE; } -EAPI Eina_Bool +EO_API Eina_Bool efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override) { const Efl_Class *set; @@ -2750,7 +2750,7 @@ efl_class_override_unregister(const Efl_Class *klass, const Efl_Class *override) return eina_hash_del_by_key(class_overrides, &klass); } -EAPI Eina_Bool +EO_API Eina_Bool efl_destructed_is(const Eo *obj_id) { Eina_Bool is; @@ -2760,7 +2760,7 @@ efl_destructed_is(const Eo *obj_id) return is; } -EAPI void +EO_API void efl_manual_free_set(Eo *obj_id, Eina_Bool manual_free) { EO_OBJ_POINTER_RETURN(obj_id, obj); @@ -2768,7 +2768,7 @@ efl_manual_free_set(Eo *obj_id, Eina_Bool manual_free) EO_OBJ_DONE(obj_id); } -EAPI Eina_Bool +EO_API Eina_Bool efl_manual_free(Eo *obj_id) { EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE); @@ -2792,7 +2792,7 @@ err: return EINA_FALSE; } -EAPI const char * +EO_API const char * efl_debug_name_get(const Eo *obj_id) { const char *override = ""; @@ -2852,7 +2852,7 @@ efl_debug_name_get(const Eo *obj_id) return eina_slstr_strbuf_new(sb); } -EAPI int +EO_API int efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Item *b) { 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 entry->timestamp - _eo_log_time_start, now - entry->timestamp, entry->bt_hits); - // Skip EAPI and _eo_log_obj_ref_op() + // Skip EO_API and _eo_log_obj_ref_op() for (i = 2; i < entry->bt_size; i++) { #ifdef HAVE_DLADDR @@ -3525,7 +3525,7 @@ _eo_classes_iterator_free(Eina_Iterator *it) free(it); } -EAPI Eina_Iterator * +EO_API Eina_Iterator * eo_classes_iterator_new(void) { _Eo_Classes_Iterator *it; @@ -3602,7 +3602,7 @@ _eo_objects_iterator_free(Eina_Iterator *it) free(it); } -EAPI Eina_Iterator * +EO_API Eina_Iterator * eo_objects_iterator_new(void) { _Eo_Objects_Iterator *it; @@ -3717,7 +3717,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_OBJECT = { .pget = _eo_value_pget }; -EOAPI const Eina_Value_Type *EINA_VALUE_TYPE_OBJECT = &_EINA_VALUE_TYPE_OBJECT; +EO_API const Eina_Value_Type *EINA_VALUE_TYPE_OBJECT = &_EINA_VALUE_TYPE_OBJECT; static const Efl_Object_Property_Reflection* _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) return NULL; } -EAPI Eina_Error +EO_API Eina_Error efl_property_reflection_set(Eo *obj_id, const char *property_name, Eina_Value value) { 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 return r; } -EAPI Eina_Value +EO_API Eina_Value efl_property_reflection_get(const Eo *obj_id, const char *property_name) { 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) return r; } -EAPI Eina_Bool +EO_API Eina_Bool efl_property_reflection_exist(Eo *obj_id, const char *property_name) { Eina_Bool r = EINA_FALSE; @@ -3802,7 +3802,7 @@ efl_property_reflection_exist(Eo *obj_id, const char *property_name) return r; } -EAPI Efl_Class_Type +EO_API Efl_Class_Type efl_class_type_get(const Efl_Class *klass_id) { 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) } -EAPI Eina_Bool +EO_API Eina_Bool efl_ownable_get(const Eo *obj) { 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) return stack; } -EAPI Eo * +EO_API Eo * _efl_added_get(void) { 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 @@ #include "eo_private.h" #include "eina_promise_private.h" -EAPI const Efl_Event_Description _EFL_EVENT_CALLBACK_ADD = +EO_API const Efl_Event_Description _EFL_EVENT_CALLBACK_ADD = EFL_EVENT_DESCRIPTION_HOT("callback,add"); -EAPI const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL = +EO_API const Efl_Event_Description _EFL_EVENT_CALLBACK_DEL = EFL_EVENT_DESCRIPTION_HOT("callback,del"); static 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 _key_generic_set(obj, pd, key, data, DATA_PTR, EINA_TRUE); } -EOAPI EFL_VOID_FUNC_BODYV(efl_key_data_set, EFL_FUNC_CALL(key, data), +EO_API EFL_VOID_FUNC_BODYV(efl_key_data_set, EFL_FUNC_CALL(key, data), const char *key, const void *data); EOLIAN static void * @@ -432,7 +432,7 @@ _efl_object_key_data_get(Eo *obj, Efl_Object_Data *pd, const char *key) return _key_generic_get(obj, pd, key, DATA_PTR); } -EOAPI EFL_FUNC_BODYV_CONST(efl_key_data_get, void *, NULL, EFL_FUNC_CALL(key), +EO_API EFL_FUNC_BODYV_CONST(efl_key_data_get, void *, NULL, EFL_FUNC_CALL(key), const char *key); EOLIAN static void @@ -449,7 +449,7 @@ _efl_object_key_ref_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *ke } } -EOAPI EFL_VOID_FUNC_BODYV(efl_key_ref_set, EFL_FUNC_CALL(key, objdata), +EO_API EFL_VOID_FUNC_BODYV(efl_key_ref_set, EFL_FUNC_CALL(key, objdata), const char *key, const Efl_Object *objdata); EOLIAN static Eo * @@ -458,7 +458,7 @@ _efl_object_key_ref_get(Eo *obj, Efl_Object_Data *pd, const char *key) return _key_generic_get(obj, pd, key, DATA_OBJ); } -EOAPI EFL_FUNC_BODYV_CONST(efl_key_ref_get, Efl_Object *, NULL, +EO_API EFL_FUNC_BODYV_CONST(efl_key_ref_get, Efl_Object *, NULL, EFL_FUNC_CALL(key), const char *key); EOLIAN static void @@ -474,7 +474,7 @@ _efl_object_key_wref_set(Eo *obj, Efl_Object_Data *pd, const char * key, const E } } -EOAPI EFL_VOID_FUNC_BODYV(efl_key_wref_set, EFL_FUNC_CALL(key, objdata), +EO_API EFL_VOID_FUNC_BODYV(efl_key_wref_set, EFL_FUNC_CALL(key, objdata), const char *key, const Efl_Object *objdata); EOLIAN static Eo * @@ -483,7 +483,7 @@ _efl_object_key_wref_get(Eo *obj, Efl_Object_Data *pd, const char * key) return _key_generic_get(obj, pd, key, DATA_OBJ_WEAK); } -EOAPI EFL_FUNC_BODYV_CONST(efl_key_wref_get, Efl_Object *, NULL, +EO_API EFL_FUNC_BODYV_CONST(efl_key_wref_get, Efl_Object *, NULL, EFL_FUNC_CALL(key), const char *key); EOLIAN static void @@ -492,7 +492,7 @@ _efl_object_key_value_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char * _key_generic_set(obj, pd, key, value, DATA_VAL, EINA_TRUE); } -EOAPI EFL_VOID_FUNC_BODYV(efl_key_value_set, EFL_FUNC_CALL(key, value), +EO_API EFL_VOID_FUNC_BODYV(efl_key_value_set, EFL_FUNC_CALL(key, value), const char *key, Eina_Value *value); EOLIAN static Eina_Value * @@ -501,7 +501,7 @@ _efl_object_key_value_get(Eo *obj, Efl_Object_Data *pd, const char *key) return _key_generic_get(obj, pd, key, DATA_VAL); } -EOAPI EFL_FUNC_BODYV_CONST(efl_key_value_get, Eina_Value *, NULL, +EO_API EFL_FUNC_BODYV_CONST(efl_key_value_get, Eina_Value *, NULL, EFL_FUNC_CALL(key), const char *key); EOLIAN static void @@ -717,7 +717,7 @@ _efl_object_debug_name_override(Eo *obj_id EINA_UNUSED, Efl_Object_Data *pd EINA { } -EAPI void +EO_API void efl_del(const Eo *obj) { if (!obj) return ; @@ -1033,7 +1033,7 @@ _efl_object_dbg_info_get(Eo *obj EINA_UNUSED, Efl_Object_Data *pd EINA_UNUSED, E return; } -EOAPI EFL_VOID_FUNC_BODYV(efl_dbg_info_get, EFL_FUNC_CALL(root_node), Efl_Dbg_Info *root_node); +EO_API EFL_VOID_FUNC_BODYV(efl_dbg_info_get, EFL_FUNC_CALL(root_node), Efl_Dbg_Info *root_node); /* Weak reference. */ @@ -1074,7 +1074,7 @@ _efl_object_wref_add(Eo *obj, Efl_Object_Data *pd, Eo **wref) } } -EOAPI EFL_VOID_FUNC_BODYV(efl_wref_add, EFL_FUNC_CALL(wref), Efl_Object **wref); +EO_API EFL_VOID_FUNC_BODYV(efl_wref_add, EFL_FUNC_CALL(wref), Efl_Object **wref); EOLIAN static void _efl_object_wref_del(Eo *obj, Efl_Object_Data *pd, Eo **wref) @@ -1140,7 +1140,7 @@ err_wref_not_obj: return; } -EOAPI EFL_VOID_FUNC_BODYV(efl_wref_del, EFL_FUNC_CALL(wref), Efl_Object **wref); +EO_API EFL_VOID_FUNC_BODYV(efl_wref_del, EFL_FUNC_CALL(wref), Efl_Object **wref); static inline void _wref_destruct(Efl_Object_Data *pd) @@ -1163,7 +1163,7 @@ _wref_destruct(Efl_Object_Data *pd) /* XXX: Legacy support, remove when legacy is dead. */ static Eina_Hash *_legacy_events_hash = NULL; -EAPI const Efl_Event_Description * +EO_API const Efl_Event_Description * efl_object_legacy_only_event_description_get(const char *_event_name) { Eina_Stringshare *event_name = eina_stringshare_add(_event_name); @@ -1586,7 +1586,7 @@ err: EINA_COLD return EINA_FALSE; } -EOAPI EFL_FUNC_BODYV(efl_event_callback_priority_add, +EO_API EFL_FUNC_BODYV(efl_event_callback_priority_add, Eina_Bool, 0, EFL_FUNC_CALL(desc, priority, cb, data), const Efl_Event_Description *desc, Efl_Callback_Priority priority, @@ -1636,7 +1636,7 @@ _efl_object_event_callback_del(Eo *obj, Efl_Object_Data *pd, return EINA_FALSE; } -EOAPI EFL_FUNC_BODYV(efl_event_callback_del, +EO_API EFL_FUNC_BODYV(efl_event_callback_del, Eina_Bool, 0, EFL_FUNC_CALL(desc, func, user_data), const Efl_Event_Description *desc, Efl_Event_Cb func, const void *user_data); @@ -1741,7 +1741,7 @@ err: return EINA_FALSE; } -EOAPI EFL_FUNC_BODYV(efl_event_callback_array_priority_add, +EO_API EFL_FUNC_BODYV(efl_event_callback_array_priority_add, Eina_Bool, 0, EFL_FUNC_CALL(array, priority, data), const Efl_Callback_Array_Item *array, Efl_Callback_Priority priority, const void *data); @@ -1789,7 +1789,7 @@ _efl_object_event_callback_array_del(Eo *obj, Efl_Object_Data *pd, return EINA_FALSE; } -EOAPI EFL_FUNC_BODYV(efl_event_callback_array_del, +EO_API EFL_FUNC_BODYV(efl_event_callback_array_del, Eina_Bool, 0, EFL_FUNC_CALL(array, user_data), const Efl_Callback_Array_Item *array, const void *user_data); @@ -1973,11 +1973,11 @@ _efl_object_event_future_scheduler_get(const Eo *obj, Efl_Object_Data *pd, Efl_C return &sched->scheduler; } -EOAPI EFL_FUNC_BODYV_CONST(efl_event_future_scheduler_get, +EO_API EFL_FUNC_BODYV_CONST(efl_event_future_scheduler_get, Eina_Future_Scheduler *, 0, EFL_FUNC_CALL(array), Efl_Callback_Array_Item *array); -EOAPI unsigned int +EO_API unsigned int _efl_object_event_callback_count(const Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const Efl_Event_Description *desc) @@ -2009,7 +2009,7 @@ _efl_object_event_callback_count(const Eo *obj EINA_UNUSED, return r; } -EOAPI EFL_FUNC_BODYV_CONST(efl_event_callback_count, +EO_API EFL_FUNC_BODYV_CONST(efl_event_callback_count, unsigned int, 0, EFL_FUNC_CALL(desc), const Efl_Event_Description *desc); @@ -2185,7 +2185,7 @@ _efl_object_event_callback_call(Eo *obj_id, Efl_Object_Data *pd, return _event_callback_call(obj_id, pd, desc, event_info, EINA_FALSE); } -EOAPI EFL_FUNC_BODYV(efl_event_callback_call, +EO_API EFL_FUNC_BODYV(efl_event_callback_call, Eina_Bool, 0, EFL_FUNC_CALL(desc, event_info), const Efl_Event_Description *desc, void *event_info); @@ -2197,7 +2197,7 @@ _efl_object_event_callback_legacy_call(Eo *obj_id, Efl_Object_Data *pd, return _event_callback_call(obj_id, pd, desc, event_info, EINA_TRUE); } -EOAPI EFL_FUNC_BODYV(efl_event_callback_legacy_call, +EO_API EFL_FUNC_BODYV(efl_event_callback_legacy_call, Eina_Bool, 0, EFL_FUNC_CALL(desc, event_info), const Efl_Event_Description *desc, void *event_info); @@ -2471,7 +2471,7 @@ _efl_object_composite_part_is(Eo *comp_obj_id EINA_UNUSED, Efl_Object_Data *pd) } /* Eo_Dbg */ -EAPI void +EO_API void efl_dbg_info_free(Efl_Dbg_Info *info) { eina_value_flush(&(info->value)); @@ -2561,7 +2561,7 @@ static const Eina_Value_Type _EFL_DBG_INFO_TYPE = { _eo_dbg_info_pget }; -EAPI const Eina_Value_Type *EFL_DBG_INFO_TYPE = &_EFL_DBG_INFO_TYPE; +EO_API const Eina_Value_Type *EFL_DBG_INFO_TYPE = &_EFL_DBG_INFO_TYPE; /* EOF event callbacks */ @@ -2597,7 +2597,7 @@ _efl_future_cb(void *data, const Eina_Value value, const Eina_Future *dead_futur return ret; } -EOAPI Eina_Future_Desc +EO_API Eina_Future_Desc efl_future_cb_from_desc(const Eo *o, const Efl_Future_Cb_Desc desc) { Efl_Future_Pending *pending = NULL; @@ -2625,7 +2625,7 @@ efl_future_cb_from_desc(const Eo *o, const Efl_Future_Cb_Desc desc) return (Eina_Future_Desc){ .cb = _efl_future_cb, .data = pending, .storage = storage }; } -EOAPI Eina_Future * +EO_API Eina_Future * efl_future_chain_array(Eo *obj, Eina_Future *prev, 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 return pd->allow_parent_unref; } -EAPI void +EO_API void ___efl_auto_unref_set(Eo *obj_id, Eina_Bool enable) { // 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 @@ #ifndef _EO_INTERNAL_H_ #define _EO_INTERNAL_H_ -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include typedef unsigned char Eina_Bool; typedef struct _Eo_Opaque Eo; @@ -37,12 +13,12 @@ typedef struct _Efl_Event_Description Efl_Event_Description; * anything about them. * @internal */ -EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name); +EO_API const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name); -EAPI void ___efl_auto_unref_set(Eo *obj_id, Eina_Bool enable); +EO_API void ___efl_auto_unref_set(Eo *obj_id, Eina_Bool enable); -EAPI int ___efl_ref2_count(const Eo *obj_id); -EAPI void ___efl_ref2_reset(const Eo *obj_id); +EO_API int ___efl_ref2_count(const Eo *obj_id); +EO_API void ___efl_ref2_reset(const Eo *obj_id); #define EFL_CLASS_SIMPLE_CLASS(FUNC, NAME, ABSTRACT_CLASS) \ static const Efl_Class_Description FUNC ##_realized_class_desc = { \ @@ -53,7 +29,4 @@ static const Efl_Class_Description FUNC ##_realized_class_desc = { \ }; \ EFL_DEFINE_CLASS(FUNC ##_realized_class_get, &FUNC ##_realized_class_desc, ABSTRACT_CLASS, NULL) -#undef EAPI -#define EAPI - #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 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), + '-e', 'EO_API', '-gchd', '@INPUT@']) endforeach @@ -54,6 +55,7 @@ foreach eo_file : pub_eo_files '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), + '-e', 'EO_API', '-gchd', '@INPUT@']) endforeach @@ -61,7 +63,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()] eo_lib = library('eo', eo_src, pub_eo_file_target, - c_args : package_c_args, + c_args : [package_c_args, '-DEO_BUILD'], dependencies: [eo_deps, eo_pub_deps, eo_ext_deps], install: true, version : meson.project_version() @@ -69,7 +71,7 @@ eo_lib = library('eo', eo_lib_dbg = library('eo_dbg', eo_src, pub_eo_file_target, - c_args : package_c_args + [ '-DEO_DEBUG' ], + c_args : [package_c_args, '-DEO_DEBUG', '-DEO_BUILD'], dependencies: [eo_deps, eo_pub_deps, eo_ext_deps], install: true, 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) printf("%s %d\n", __func__, pd->protected_x1); } -EAPI EFL_VOID_FUNC_BODY(inherit_prot_print); +EFL_VOID_FUNC_BODY(inherit_prot_print); static Eina_Bool _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 @@ #ifndef INHERIT_H #define INHERIT_H -EAPI void inherit_prot_print(Eo *obj); +void inherit_prot_print(Eo *obj); #define INHERIT_CLASS inherit_class_get() const 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 int a; } Private_Data; -EAPI const Efl_Event_Description _EV_A_CHANGED = +const Efl_Event_Description _EV_A_CHANGED = EFL_EVENT_DESCRIPTION("a,changed"); #define MY_CLASS SIMPLE_CLASS @@ -30,7 +30,7 @@ _a_set(Eo *obj, void *class_data, int a) efl_event_callback_legacy_call(obj, EV_A_CHANGED, &pd->a); } -EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); static Eina_Bool _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 @@ #ifndef SIMPLE_H #define SIMPLE_H -EAPI void simple_a_set(Eo *obj, int a); +void simple_a_set(Eo *obj, int a); typedef struct { 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 @@ #include "Eo.h" #include "composite_objects_simple.h" -EAPI const Efl_Event_Description _EV_A_CHANGED = +const Efl_Event_Description _EV_A_CHANGED = EFL_EVENT_DESCRIPTION("a,changed"); #define MY_CLASS SIMPLE_CLASS @@ -27,73 +27,73 @@ _a_get(Eo *obj EINA_UNUSED, void *class_data) return pd->a; } -EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); -EAPI EFL_FUNC_BODY(simple_a_get, int, 0); +EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); +EFL_FUNC_BODY(simple_a_get, int, 0); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set1, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set2, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set3, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set4, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set5, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set6, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set7, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set8, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set9, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set10, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set11, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set12, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set13, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set14, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set15, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set16, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set17, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set18, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set19, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set20, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set21, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set22, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set23, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set24, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set25, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set26, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set27, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set28, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set29, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set30, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set31, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_set32, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get1, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get2, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get3, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get4, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get5, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get6, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get7, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get8, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get9, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get10, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get11, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get12, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get13, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get14, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get15, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get16, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get17, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get18, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get19, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get20, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get21, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get22, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get23, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get24, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get25, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get26, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get27, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get28, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get29, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get30, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get31, EFL_FUNC_CALL(a), int a); -EAPI EFL_VOID_FUNC_BODYV(simple_a_get32, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set1, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set2, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set3, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set4, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set5, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set6, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set7, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set8, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set9, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set10, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set11, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set12, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set13, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set14, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set15, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set16, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set17, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set18, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set19, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set20, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set21, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set22, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set23, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set24, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set25, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set26, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set27, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set28, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set29, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set30, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set31, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set32, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get1, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get2, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get3, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get4, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get5, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get6, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get7, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get8, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get9, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get10, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get11, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get12, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get13, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get14, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get15, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get16, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get17, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get18, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get19, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get20, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get21, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get22, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get23, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get24, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get25, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get26, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get27, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get28, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get29, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get30, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get31, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_get32, EFL_FUNC_CALL(a), int a); static 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 int a; } Simple_Public_Data; -EAPI void simple_a_set(Eo *obj, int a); -EAPI int simple_a_get(Eo *obj); +void simple_a_set(Eo *obj, int a); +int simple_a_get(Eo *obj); -EAPI void simple_a_set1(Eo *obj, int a); -EAPI void simple_a_set2(Eo *obj, int a); -EAPI void simple_a_set3(Eo *obj, int a); -EAPI void simple_a_set4(Eo *obj, int a); -EAPI void simple_a_set5(Eo *obj, int a); -EAPI void simple_a_set6(Eo *obj, int a); -EAPI void simple_a_set7(Eo *obj, int a); -EAPI void simple_a_set8(Eo *obj, int a); -EAPI void simple_a_set9(Eo *obj, int a); -EAPI void simple_a_set10(Eo *obj, int a); -EAPI void simple_a_set11(Eo *obj, int a); -EAPI void simple_a_set12(Eo *obj, int a); -EAPI void simple_a_set13(Eo *obj, int a); -EAPI void simple_a_set14(Eo *obj, int a); -EAPI void simple_a_set15(Eo *obj, int a); -EAPI void simple_a_set16(Eo *obj, int a); -EAPI void simple_a_set17(Eo *obj, int a); -EAPI void simple_a_set18(Eo *obj, int a); -EAPI void simple_a_set19(Eo *obj, int a); -EAPI void simple_a_set20(Eo *obj, int a); -EAPI void simple_a_set21(Eo *obj, int a); -EAPI void simple_a_set22(Eo *obj, int a); -EAPI void simple_a_set23(Eo *obj, int a); -EAPI void simple_a_set24(Eo *obj, int a); -EAPI void simple_a_set25(Eo *obj, int a); -EAPI void simple_a_set26(Eo *obj, int a); -EAPI void simple_a_set27(Eo *obj, int a); -EAPI void simple_a_set28(Eo *obj, int a); -EAPI void simple_a_set29(Eo *obj, int a); -EAPI void simple_a_set30(Eo *obj, int a); -EAPI void simple_a_set31(Eo *obj, int a); -EAPI void simple_a_set32(Eo *obj, int a); -EAPI void simple_a_get1(Eo *obj, int a); -EAPI void simple_a_get2(Eo *obj, int a); -EAPI void simple_a_get3(Eo *obj, int a); -EAPI void simple_a_get4(Eo *obj, int a); -EAPI void simple_a_get5(Eo *obj, int a); -EAPI void simple_a_get6(Eo *obj, int a); -EAPI void simple_a_get7(Eo *obj, int a); -EAPI void simple_a_get8(Eo *obj, int a); -EAPI void simple_a_get9(Eo *obj, int a); -EAPI void simple_a_get10(Eo *obj, int a); -EAPI void simple_a_get11(Eo *obj, int a); -EAPI void simple_a_get12(Eo *obj, int a); -EAPI void simple_a_get13(Eo *obj, int a); -EAPI void simple_a_get14(Eo *obj, int a); -EAPI void simple_a_get15(Eo *obj, int a); -EAPI void simple_a_get16(Eo *obj, int a); -EAPI void simple_a_get17(Eo *obj, int a); -EAPI void simple_a_get18(Eo *obj, int a); -EAPI void simple_a_get19(Eo *obj, int a); -EAPI void simple_a_get20(Eo *obj, int a); -EAPI void simple_a_get21(Eo *obj, int a); -EAPI void simple_a_get22(Eo *obj, int a); -EAPI void simple_a_get23(Eo *obj, int a); -EAPI void simple_a_get24(Eo *obj, int a); -EAPI void simple_a_get25(Eo *obj, int a); -EAPI void simple_a_get26(Eo *obj, int a); -EAPI void simple_a_get27(Eo *obj, int a); -EAPI void simple_a_get28(Eo *obj, int a); -EAPI void simple_a_get29(Eo *obj, int a); -EAPI void simple_a_get30(Eo *obj, int a); -EAPI void simple_a_get31(Eo *obj, int a); -EAPI void simple_a_get32(Eo *obj, int a); +void simple_a_set1(Eo *obj, int a); +void simple_a_set2(Eo *obj, int a); +void simple_a_set3(Eo *obj, int a); +void simple_a_set4(Eo *obj, int a); +void simple_a_set5(Eo *obj, int a); +void simple_a_set6(Eo *obj, int a); +void simple_a_set7(Eo *obj, int a); +void simple_a_set8(Eo *obj, int a); +void simple_a_set9(Eo *obj, int a); +void simple_a_set10(Eo *obj, int a); +void simple_a_set11(Eo *obj, int a); +void simple_a_set12(Eo *obj, int a); +void simple_a_set13(Eo *obj, int a); +void simple_a_set14(Eo *obj, int a); +void simple_a_set15(Eo *obj, int a); +void simple_a_set16(Eo *obj, int a); +void simple_a_set17(Eo *obj, int a); +void simple_a_set18(Eo *obj, int a); +void simple_a_set19(Eo *obj, int a); +void simple_a_set20(Eo *obj, int a); +void simple_a_set21(Eo *obj, int a); +void simple_a_set22(Eo *obj, int a); +void simple_a_set23(Eo *obj, int a); +void simple_a_set24(Eo *obj, int a); +void simple_a_set25(Eo *obj, int a); +void simple_a_set26(Eo *obj, int a); +void simple_a_set27(Eo *obj, int a); +void simple_a_set28(Eo *obj, int a); +void simple_a_set29(Eo *obj, int a); +void simple_a_set30(Eo *obj, int a); +void simple_a_set31(Eo *obj, int a); +void simple_a_set32(Eo *obj, int a); +void simple_a_get1(Eo *obj, int a); +void simple_a_get2(Eo *obj, int a); +void simple_a_get3(Eo *obj, int a); +void simple_a_get4(Eo *obj, int a); +void simple_a_get5(Eo *obj, int a); +void simple_a_get6(Eo *obj, int a); +void simple_a_get7(Eo *obj, int a); +void simple_a_get8(Eo *obj, int a); +void simple_a_get9(Eo *obj, int a); +void simple_a_get10(Eo *obj, int a); +void simple_a_get11(Eo *obj, int a); +void simple_a_get12(Eo *obj, int a); +void simple_a_get13(Eo *obj, int a); +void simple_a_get14(Eo *obj, int a); +void simple_a_get15(Eo *obj, int a); +void simple_a_get16(Eo *obj, int a); +void simple_a_get17(Eo *obj, int a); +void simple_a_get18(Eo *obj, int a); +void simple_a_get19(Eo *obj, int a); +void simple_a_get20(Eo *obj, int a); +void simple_a_get21(Eo *obj, int a); +void simple_a_get22(Eo *obj, int a); +void simple_a_get23(Eo *obj, int a); +void simple_a_get24(Eo *obj, int a); +void simple_a_get25(Eo *obj, int a); +void simple_a_get26(Eo *obj, int a); +void simple_a_get27(Eo *obj, int a); +void simple_a_get28(Eo *obj, int a); +void simple_a_get29(Eo *obj, int a); +void simple_a_get30(Eo *obj, int a); +void simple_a_get31(Eo *obj, int a); +void simple_a_get32(Eo *obj, int a); extern const Efl_Event_Description _EV_A_CHANGED; #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) my_init_count--; } -EAPI EFL_VOID_FUNC_BODYV(mixin_add_and_print, EFL_FUNC_CALL(x), int x); +EFL_VOID_FUNC_BODYV(mixin_add_and_print, EFL_FUNC_CALL(x), int x); static Eina_Bool _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 @@ #ifndef MIXIN_H #define MIXIN_H -EAPI void mixin_add_and_print(Eo *obj, int x); +void mixin_add_and_print(Eo *obj, int x); #define MIXIN_CLASS mixin_class_get() const 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 @@ #ifndef SIMPLE_H #define SIMPLE_H -EAPI void simple_a_set(Eo *obj, int a); -EAPI int simple_a_get(Eo *obj); -EAPI void simple_b_set(Eo *obj, int b); -EAPI int simple_b_get(Eo *obj); +void simple_a_set(Eo *obj, int a); +int simple_a_get(Eo *obj); +void simple_b_set(Eo *obj, int b); +int simple_b_get(Eo *obj); #define SIMPLE_CLASS simple_class_get() const 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) return EINA_TRUE; } -EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); -EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); +EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); +EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); static Eina_Bool _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 @@ #ifndef INHERIT2_H #define INHERIT2_H -EAPI Eina_Bool inherit2_print(Eo *obj); -EAPI Eina_Bool inherit2_print2(Eo *obj); +Eina_Bool inherit2_print(Eo *obj); +Eina_Bool inherit2_print2(Eo *obj); #define INHERIT2_CLASS inherit2_class_get() const 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) return EINA_TRUE; } -EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); -EAPI EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); -EAPI EFL_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE); -EAPI EFL_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE); +EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); +EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); +EFL_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE); +EFL_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE); static Eina_Bool _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 int a; } Simple_Public_Data; -EAPI void simple_a_set(Eo *obj, int a); -EAPI Eina_Bool simple_a_print(Eo *obj); -EAPI Eina_Bool simple_class_print(const Eo *obj); -EAPI Eina_Bool simple_class_print2(const Eo *obj); +void simple_a_set(Eo *obj, int a); +Eina_Bool simple_a_print(Eo *obj); +Eina_Bool simple_class_print(const Eo *obj); +Eina_Bool simple_class_print2(const Eo *obj); extern const Efl_Event_Description _SIG_A_CHANGED; #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 @@ #ifndef INTERFACE_H #define INTERFACE_H -EAPI int interface_ab_sum_get(Eo *obj); +int interface_ab_sum_get(Eo *obj); #define INTERFACE_CLASS interface_class_get() const 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 @@ #ifndef INTERFACE2_H #define INTERFACE2_H -EAPI int interface2_ab_sum_get2(Eo *obj); +int interface2_ab_sum_get2(Eo *obj); #define INTERFACE2_CLASS interface2_class_get() const 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 @@ #ifndef SIMPLE_H #define SIMPLE_H -EAPI void simple_a_set(Eo *obj, int a); -EAPI int simple_a_get(Eo *obj); -EAPI void simple_b_set(Eo *obj, int b); -EAPI int simple_b_get(Eo *obj); +void simple_a_set(Eo *obj, int a); +int simple_a_get(Eo *obj); +void simple_b_set(Eo *obj, int b); +int simple_b_get(Eo *obj); #define SIMPLE_CLASS simple_class_get() const 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) efl_destructor(efl_super(obj, MY_CLASS)); } -EAPI EFL_FUNC_BODY(mixin_ab_sum_get, int, 0); +EFL_FUNC_BODY(mixin_ab_sum_get, int, 0); static Eina_Bool _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 @@ #ifndef MIXIN_H #define MIXIN_H -EAPI int mixin_ab_sum_get(Eo *obj); +int mixin_ab_sum_get(Eo *obj); #define MIXIN_CLASS mixin_class_get() const 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 @@ #ifndef SIMPLE_H #define SIMPLE_H -EAPI void simple_a_set(Eo *obj, int a); -EAPI int simple_a_get(Eo *obj); -EAPI void simple_b_set(Eo *obj, int b); -EAPI int simple_b_get(Eo *obj); +void simple_a_set(Eo *obj, int a); +int simple_a_get(Eo *obj); +void simple_b_set(Eo *obj, int b); +int simple_b_get(Eo *obj); #define SIMPLE_CLASS simple_class_get() const 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 int a; } Private_Data; -EAPI const Efl_Event_Description _EV_A_CHANGED = +const Efl_Event_Description _EV_A_CHANGED = EFL_EVENT_DESCRIPTION("a,changed"); -EAPI const Efl_Event_Description _EV_RESTART = +const Efl_Event_Description _EV_RESTART = EFL_EVENT_DESCRIPTION_RESTART("restart"); #define MY_CLASS SIMPLE_CLASS @@ -69,7 +69,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED) return obj; } -EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); +EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); static Eina_Bool _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 int cb_count; } Simple_Public_Data; -EAPI void simple_a_set(Eo *obj, int a); +void simple_a_set(Eo *obj, int a); extern const Efl_Event_Description _EV_A_CHANGED; #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) //implementation of the test function -EAPI void simple_error_test(Eo *obj); +void simple_error_test(Eo *obj); EFL_VOID_FUNC_BODY_FALLBACK(simple_error_test, test_func();); static void _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 @@ #define MY_CLASS SIMPLE_CLASS -EAPI const Efl_Event_Description _EV_A_CHANGED = +const Efl_Event_Description _EV_A_CHANGED = EFL_EVENT_DESCRIPTION("a,changed"); -EAPI const Efl_Event_Description _EV_A_CHANGED2 = +const Efl_Event_Description _EV_A_CHANGED2 = EFL_EVENT_DESCRIPTION("a,changed"); static 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 int a; } Simple_Public_Data; -EAPI void simple_a_set(Eo *obj, int a); -EAPI int simple_a_get(const Eo *obj); -EAPI Eina_Bool simple_a_print(Eo *obj); -EAPI Eina_Bool simple_class_hi_print(const Eo *obj); -EAPI void simple_recursive(Eo *obj, int n); -EAPI void simple_pure_virtual(Eo *obj); -EAPI void simple_no_implementation(Eo *obj); -EAPI Eo *simple_part_get(Eo *obj, const char *name); +void simple_a_set(Eo *obj, int a); +int simple_a_get(const Eo *obj); +Eina_Bool simple_a_print(Eo *obj); +Eina_Bool simple_class_hi_print(const Eo *obj); +void simple_recursive(Eo *obj, int n); +void simple_pure_virtual(Eo *obj); +void simple_no_implementation(Eo *obj); +Eo *simple_part_get(Eo *obj, const char *name); extern const Efl_Event_Description _EV_A_CHANGED; #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 @@ #define MY_CLASS DOMAIN_CLASS -EAPI const Efl_Event_Description _EV_DOMAIN_A_CHANGED = +const Efl_Event_Description _EV_DOMAIN_A_CHANGED = EFL_EVENT_DESCRIPTION("domain,a,changed"); static 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 int a; } Domain_Public_Data; -EAPI void domain_a_set(Eo *obj, int a); -EAPI int domain_a_get(Eo *obj); -EAPI void domain_recursive(Eo *obj, int n); +void domain_a_set(Eo *obj, int a); +int domain_a_get(Eo *obj); +void domain_recursive(Eo *obj, int n); extern const Efl_Event_Description _EV_DOMAIN_A_CHANGED; #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 @@ //Class definition with one event -EWAPI const Efl_Class *efl_test_event_class_get(void) EINA_CONST; +EO_API_WEAK const Efl_Class *efl_test_event_class_get(void) EINA_CONST; -EWAPI extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER; -EWAPI extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE; -EWAPI extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_CLAMP_TEST; +EO_API_WEAK extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER; +EO_API_WEAK extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE; +EO_API_WEAK extern const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_CLAMP_TEST; #define EFL_TEST_EVENT_EVENT_TESTER (&(_EFL_TEST_EVENT_EVENT_TESTER)) #define EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE (&(_EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE)) @@ -232,13 +232,13 @@ void eo_test_event(TCase *tc) //class implementation -EWAPI const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER = +EO_API_WEAK const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER = EFL_EVENT_DESCRIPTION("tester"); -EWAPI const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE = +EO_API_WEAK const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_SUBSCRIBE = EFL_EVENT_DESCRIPTION("tester"); -EWAPI const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_CLAMP_TEST = +EO_API_WEAK const Efl_Event_Description _EFL_TEST_EVENT_EVENT_TESTER_CLAMP_TEST = EFL_EVENT_DESCRIPTION("tester"); 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) simple_a_set(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a); } -EAPI int test_class_beef_get(const Efl_Object *obj); +int test_class_beef_get(const Efl_Object *obj); EFL_FUNC_BODY_CONST(test_class_beef_get, int, 0) 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) return r; } -EOAPI EFL_VOID_FUNC_BODYV(complex_interface_i_test_set, EFL_FUNC_CALL(i), int i); +EFL_VOID_FUNC_BODYV(complex_interface_i_test_set, EFL_FUNC_CALL(i), int i); static Eina_Value __eolian_complex_interface_i_test_get_reflect(const Eo *obj) @@ -99,7 +99,7 @@ __eolian_complex_interface_i_test_get_reflect(const Eo *obj) return eina_value_int_init(val); } -EOAPI EFL_FUNC_BODY_CONST(complex_interface_i_test_get, int, 0); +EFL_FUNC_BODY_CONST(complex_interface_i_test_get, int, 0); static Eina_Bool _complex_interface_class_initializer(Efl_Class *klass) @@ -157,7 +157,7 @@ __eolian_complex_mixin_m_test_set_reflect(Eo *obj, Eina_Value val) return r; } -EOAPI EFL_VOID_FUNC_BODYV(complex_mixin_m_test_set, EFL_FUNC_CALL(i), int i); +EFL_VOID_FUNC_BODYV(complex_mixin_m_test_set, EFL_FUNC_CALL(i), int i); static Eina_Value @@ -167,7 +167,7 @@ __eolian_complex_mixin_m_test_get_reflect(const Eo *obj) return eina_value_int_init(val); } -EOAPI EFL_FUNC_BODY_CONST(complex_mixin_m_test_get, int, 0); +EFL_FUNC_BODY_CONST(complex_mixin_m_test_get, int, 0); static Eina_Bool _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 @@ typedef Eo Complex_Mixin; #define COMPLEX_MIXIN_MIXIN complex_mixin_mixin_get() -EWAPI const Efl_Class *complex_mixin_mixin_get(void) EINA_CONST; -EOAPI void complex_mixin_m_test_set(Eo *obj, int i); -EOAPI int complex_mixin_m_test_get(const Eo *obj); +const Efl_Class *complex_mixin_mixin_get(void) EINA_CONST; +void complex_mixin_m_test_set(Eo *obj, int i); +int complex_mixin_m_test_get(const Eo *obj); typedef Eo Complex_Interface; #define COMPLEX_INTERFACE_INTERFACE complex_interface_interface_get() -EWAPI const Efl_Class *complex_interface_interface_get(void) EINA_CONST; -EOAPI void complex_interface_i_test_set(Eo *obj, int i); -EOAPI int complex_interface_i_test_get(const Eo *obj); +const Efl_Class *complex_interface_interface_get(void) EINA_CONST; +void complex_interface_i_test_set(Eo *obj, int i); +int complex_interface_i_test_get(const Eo *obj); typedef Eo Complex_Class; #define COMPLEX_CLASS_CLASS complex_class_class_get() -EWAPI const Efl_Class *complex_class_class_get(void) EINA_CONST; +const Efl_Class *complex_class_class_get(void) EINA_CONST; #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 @@ #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "a.eo.h" struct _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 @@ #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "a.eo.h" #include "b.eo.h" 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 @@ #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "a.eo.h" #include "b.eo.h" #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 @@ struct Complex_Data {}; typedef struct Complex_Data Complex_Data; +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "complex.eo.h" EOLIAN 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 @@ #include #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "complex.eo.h" #include "complex.eo.hh" 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 @@ #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include #include #include 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 @@ #include #define GENERIC_BETA +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include #include #include 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; typedef Eo Cyclic2; } +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include #include #include 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 @@ #include #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include #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 @@ #include #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include #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 @@ #define GENERIC_BETA #define GENERIC_PROTECTED +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "generic.eo.h" #include "generic_interface.eo.h" 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 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), + '-e', 'EOLIANCXXTEST_API', '-gch', '@INPUT@']) endforeach 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; #define MY_CLASS TYPE1_TYPE2_TYPE_GENERATION_CLASS +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "name1_name2_type_generation.eo.h" void _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; struct Ns_Name_Other_Data {}; typedef struct Ns_Name_Other_Data Ns_Name_Other_Data; +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "name_name.eo.h" #include "name_name.eo.c" #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 @@ #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "name_name.eo.h" #include "name_name.eo.hh" #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 @@ #include #include +#define EOLIANCXXTEST_API +#define EOLIANCXXTEST_API_WEAK + #include "simple.eo.h" #define MY_CLASS SIMPLE_CLASS