diff options
| author | Felipe Magno de Almeida <felipe@expertise.dev> | 2020-09-20 10:23:26 -0300 |
|---|---|---|
| committer | Felipe Magno de Almeida <felipe@expertise.dev> | 2020-12-14 13:22:21 -0300 |
| commit | ea6f250683f80c7854a428f7eac72a9746ccc1cd (patch) | |
| tree | 4c424e71548a76cec4e1814de55f41a264c32ebf | |
| parent | 4bca3f755515007830aa17a4a0407b7d3159e39b (diff) | |
| download | efl-ea6f250683f80c7854a428f7eac72a9746ccc1cd.tar.gz | |
ecore: Rename EAPI macro to ECORE_API in Ecore library
Patch from a series of patches to rename EAPI symbols to specific
library DSOs.
EAPI was designed to be able to pass
```__attribute__ ((visibility ("default")))``` for symbols with
GCC, which would mean that even if -fvisibility=hidden was used
when compiling the library, the needed symbols would get exported.
MSVC __almost__ works like GCC (or mingw) in which you can
declare everything as export and it will just work (slower, but
it will work). But there's a caveat: global variables will not
work the same way for MSVC, but works for mingw and GCC.
For global variables (as opposed to functions), MSVC requires
correct DSO visibility for MSVC: instead of declaring a symbol as
export for everything, you need to declare it as import when
importing from another DSO and export when defining it locally.
With current EAPI definitions, we get the following example
working in mingw and MSVC (observe it doesn't define any global
variables as exported symbols).
Example 1:
dll1:
```
EAPI void foo(void);
EAPI void bar()
{
foo();
}
```
dll2:
```
EAPI void foo()
{
printf ("foo\n");
}
```
This works fine with API defined as __declspec(dllexport) in both
cases and for gcc defining as
```__atttribute__((visibility("default")))```.
However, the following:
Example 2:
dll1:
```
EAPI extern int foo;
EAPI void foobar(void);
EAPI void bar()
{
foo = 5;
foobar();
}
```
dll2:
```
EAPI int foo = 0;
EAPI void foobar()
{
printf ("foo %d\n", foo);
}
```
This will work on mingw but will not work for MSVC. And that's why
EAPI is the only solution that worked for MSVC.
Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com>
Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev>
Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com>
37 files changed, 454 insertions, 540 deletions
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h index e87ccc6093..bafb57e400 100644 --- a/src/lib/ecore/Ecore.h +++ b/src/lib/ecore/Ecore.h @@ -276,32 +276,7 @@ #include <Eina.h> #include <Eo.h> #include <Efl.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 <ecore_api.h> #ifdef _WIN32 # define WIN32_LEAN_AND_MEAN @@ -331,13 +306,10 @@ extern "C" { #endif #include "Ecore_Eo.h" -EAPI double _ecore_main_loop_wakeup_time_get(void); +ECORE_API double _ecore_main_loop_wakeup_time_get(void); #ifdef __cplusplus } #endif -#undef EAPI -#define EAPI - #endif diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h index 899debc267..aa2e8423db 100644 --- a/src/lib/ecore/Ecore_Common.h +++ b/src/lib/ecore/Ecore_Common.h @@ -47,7 +47,7 @@ * This function will call eina_init(), so other environment variables * may apply. */ -EAPI int ecore_init(void); +ECORE_API int ecore_init(void); /** * Shuts down connections, signal handlers sockets etc. @@ -60,7 +60,7 @@ EAPI int ecore_init(void); * Do not call this function from any callback that may be called from the main * loop, as the main loop will then fall over and not function properly. */ -EAPI int ecore_shutdown(void); +ECORE_API int ecore_shutdown(void); /** * This function will propagate the events on the main loop. So you @@ -70,7 +70,7 @@ EAPI int ecore_shutdown(void); * Once you are shuting down your program, you should symmetrically * call ecore_shutdown_ex(). */ -EAPI unsigned int ecore_init_ex(int argc, char **argv); +ECORE_API unsigned int ecore_init_ex(int argc, char **argv); /** * Shuts down connections, signal handlers sockets etc. @@ -85,7 +85,7 @@ EAPI unsigned int ecore_init_ex(int argc, char **argv); * * Note: This function should be called in symetric to ecore_init_ex() */ -EAPI unsigned int ecore_shutdown_ex(void); +ECORE_API unsigned int ecore_shutdown_ex(void); /** * @brief Inform EFL of the version this application was built for. @@ -94,7 +94,7 @@ EAPI unsigned int ecore_shutdown_ex(void); * * @since 1.18 (as beta) */ -EWAPI void efl_build_version_set(int vmaj, int vmin, int vmic, int revision, const char *flavor, const char *build_id); +ECORE_API ECORE_API_WEAK void efl_build_version_set(int vmaj, int vmin, int vmic, int revision, const char *flavor, const char *build_id); /** * @} @@ -147,7 +147,7 @@ typedef struct _Ecore_Version int revision; /** < git revision (0 if a proper release or the git revision number Ecore is built from) */ } Ecore_Version; -EAPI extern Ecore_Version *ecore_version; +ECORE_API extern Ecore_Version *ecore_version; #define ECORE_CALLBACK_CANCEL EINA_FALSE /**< Return value to remove a callback */ #define ECORE_CALLBACK_RENEW EINA_TRUE /**< Return value to keep a callback */ @@ -180,7 +180,7 @@ typedef int (*Ecore_Select_Function)(int nfds, fd_set *readfds, fd_set *writefds * * @see ecore_main_loop_iterate_may_block() */ -EAPI void ecore_main_loop_iterate(void); +ECORE_API void ecore_main_loop_iterate(void); /** * Runs a single iteration of the main loop to process everything on the @@ -200,7 +200,7 @@ EAPI void ecore_main_loop_iterate(void); * @return @c 1 if event exists, else @c 0. * @see ecore_main_loop_iterate() */ -EAPI int ecore_main_loop_iterate_may_block(int may_block); +ECORE_API int ecore_main_loop_iterate_may_block(int may_block); /** * Sets the function to use when monitoring multiple file descriptors, @@ -215,7 +215,7 @@ EAPI int ecore_main_loop_iterate_may_block(int may_block); * * @param func The function to be used. */ -EAPI void ecore_main_loop_select_func_set(Ecore_Select_Function func); +ECORE_API void ecore_main_loop_select_func_set(Ecore_Select_Function func); /** * Gets the select function set by ecore_select_func_set(), @@ -224,7 +224,7 @@ EAPI void ecore_main_loop_select_func_set(Ecore_Select_Function func); * @return A function which can be used to replace select() in the main loop. * */ -EAPI Ecore_Select_Function ecore_main_loop_select_func_get(void); +ECORE_API Ecore_Select_Function ecore_main_loop_select_func_get(void); /** * Requests ecore to integrate GLib's main loop. @@ -276,7 +276,7 @@ EAPI Ecore_Select_Function ecore_main_loop_select_func_get(void); * --with-glib=always. * */ -EAPI Eina_Bool ecore_main_loop_glib_integrate(void); +ECORE_API Eina_Bool ecore_main_loop_glib_integrate(void); /** * Disables always integrating GLib. @@ -287,7 +287,7 @@ EAPI Eina_Bool ecore_main_loop_glib_integrate(void); * This is for apps that explicitly do not want this to happen for whatever * reasons they may have. */ -EAPI void ecore_main_loop_glib_always_integrate_disable(void); +ECORE_API void ecore_main_loop_glib_always_integrate_disable(void); /** * Runs the application main loop. @@ -311,7 +311,7 @@ EAPI void ecore_main_loop_glib_always_integrate_disable(void); * timeout for the timers can be changed using * ecore_main_loop_select_func_set(). */ -EAPI void ecore_main_loop_begin(void); +ECORE_API void ecore_main_loop_begin(void); /** * Quits the main loop once all the events currently on the queue have @@ -322,7 +322,7 @@ EAPI void ecore_main_loop_begin(void); * end of the current main loop iteration. * */ -EAPI void ecore_main_loop_quit(void); +ECORE_API void ecore_main_loop_quit(void); /** * Returns if an animator has ticked off during this loop iteration. @@ -333,7 +333,7 @@ EAPI void ecore_main_loop_quit(void); * * @since 1.9 */ -EAPI Eina_Bool ecore_main_loop_animator_ticked_get(void); +ECORE_API Eina_Bool ecore_main_loop_animator_ticked_get(void); /** * Returns if the ecore_main_loop is running. @@ -344,7 +344,7 @@ EAPI Eina_Bool ecore_main_loop_animator_ticked_get(void); * * @since 1.13 */ -EAPI int ecore_main_loop_nested_get(void); +ECORE_API int ecore_main_loop_nested_get(void); /** * @typedef Ecore_Cb Ecore_Cb @@ -372,7 +372,7 @@ typedef void *(*Ecore_Data_Cb)(void *data); * @return @c EINA_TRUE on success, else @c EINA_FALSE. * @since 1.7 */ -EAPI Eina_Bool ecore_fork_reset_callback_add(Ecore_Cb func, const void *data); +ECORE_API Eina_Bool ecore_fork_reset_callback_add(Ecore_Cb func, const void *data); /** * This removes the callback specified. @@ -386,7 +386,7 @@ EAPI Eina_Bool ecore_fork_reset_callback_add(Ecore_Cb func, const void *data); * @return @c EINA_TRUE on success, else @c EINA_FALSE. * @since 1.7 */ -EAPI Eina_Bool ecore_fork_reset_callback_del(Ecore_Cb func, const void *data); +ECORE_API Eina_Bool ecore_fork_reset_callback_del(Ecore_Cb func, const void *data); /** * Resets the ecore internal state after a fork. @@ -405,7 +405,7 @@ EAPI Eina_Bool ecore_fork_reset_callback_del(Ecore_Cb func, const void *data); * * @since 1.7 */ -EAPI void ecore_fork_reset(void); +ECORE_API void ecore_fork_reset(void); /** * @brief Calls callback asynchronously in the main loop. @@ -422,7 +422,7 @@ EAPI void ecore_fork_reset(void); * in the thread, it is owned by the main loop and your callback should take * care of freeing it if necessary. */ -EAPI void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data); +ECORE_API void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data); /** * @brief Calls callback synchronously in the main loop. @@ -439,7 +439,7 @@ EAPI void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data); * Remember this function will block until the callback is executed in the * main loop. It can take time and you have no guaranty about the timeline. */ -EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data); +ECORE_API void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data); /** * @brief Waits for the next thread call in the main loop. @@ -452,7 +452,7 @@ EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *d * is triggered from a thread or the time specified by wait has * passed. */ -EAPI void ecore_main_loop_thread_safe_call_wait(double wait); +ECORE_API void ecore_main_loop_thread_safe_call_wait(double wait); /** * @brief This function suspends the main loop in a know state. @@ -472,7 +472,7 @@ EAPI void ecore_main_loop_thread_safe_call_wait(double wait); * We still advise you, when possible, to use ecore_main_loop_thread_safe_call_async() * as it will not block the thread nor the main loop. */ -EAPI int ecore_thread_main_loop_begin(void); +ECORE_API int ecore_thread_main_loop_begin(void); /** * @brief Unlocks the main loop. @@ -485,7 +485,7 @@ EAPI int ecore_thread_main_loop_begin(void); * After a call to ecore_thread_main_loop_begin(), you need to absolutely * call ecore_thread_main_loop_end(), or you application will stay frozen. */ -EAPI int ecore_thread_main_loop_end(void); +ECORE_API int ecore_thread_main_loop_end(void); /** * @} @@ -694,7 +694,7 @@ struct _Ecore_Event_Signal_Realtime * event, so all handler set to handle that event type that have not already * been called, will not be. */ -EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data); +ECORE_API Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data); /** * @brief Adds an event handler to the beginning of the handler list. @@ -707,7 +707,7 @@ EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_ * creates the handler at the start of the list. Do not use this function. * @since 1.21 */ -EAPI Ecore_Event_Handler *ecore_event_handler_prepend(int type, Ecore_Event_Handler_Cb func, const void *data); +ECORE_API Ecore_Event_Handler *ecore_event_handler_prepend(int type, Ecore_Event_Handler_Cb func, const void *data); /** * @brief Deletes an event handler. @@ -719,7 +719,7 @@ EAPI Ecore_Event_Handler *ecore_event_handler_prepend(int type, Ecore_Event_Hand * handler was added by ecore_event_handler_add(). On failure @c NULL will be * returned. Once a handler is deleted it will no longer be called. */ -EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler); +ECORE_API void *ecore_event_handler_del(Ecore_Event_Handler *event_handler); /** * @brief Adds an event to the event queue. @@ -736,7 +736,7 @@ EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler); * cleaning up. If @p func_free is NULL, free() will be called with the private * structure pointer. */ -EAPI Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data); +ECORE_API Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data); /** * @brief Deletes an event from the queue. @@ -749,7 +749,7 @@ EAPI Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, vo * cleanup, and so if the free function depends on the data pointer to work, * you should defer cleaning of this till the free function is called later. */ -EAPI void *ecore_event_del(Ecore_Event *event); +ECORE_API void *ecore_event_del(Ecore_Event *event); /** * @brief Gets the data associated with an #Ecore_Event_Handler. @@ -759,7 +759,7 @@ EAPI void *ecore_event_del(Ecore_Event *event); * This function returns the data previously associated with @p eh by * ecore_event_handler_add(). */ -EAPI void *ecore_event_handler_data_get(Ecore_Event_Handler *eh); +ECORE_API void *ecore_event_handler_data_get(Ecore_Event_Handler *eh); /** * @brief Sets the data associated with an #Ecore_Event_Handler. @@ -770,7 +770,7 @@ EAPI void *ecore_event_handler_data_get(Ecore_Event_Handler *eh); * This function sets @p data to @p eh and returns the old data pointer * which was previously associated with @p eh by ecore_event_handler_add(). */ -EAPI void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data); +ECORE_API void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data); /** * @brief Allocates a new event type id sensibly and returns the new id. @@ -782,7 +782,7 @@ EAPI void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *dat * it is calculated, except that the ID will be unique to the current instance * of the process. */ -EAPI int ecore_event_type_new(void); +ECORE_API int ecore_event_type_new(void); /** * @brief Forcefully flush all pending type without processing them @@ -792,7 +792,7 @@ EAPI int ecore_event_type_new(void); * This function is to be called before calling ecore_shutdown() if any event * has still a chance to be in the ecore event queue. */ -EAPI void ecore_event_type_flush_internal(int type, ...); +ECORE_API void ecore_event_type_flush_internal(int type, ...); /** * @brief Forcefully flush all pending type without processing them @@ -825,7 +825,7 @@ EAPI void ecore_event_type_flush_internal(int type, ...); * called and is passed the loop_data(returned by @c func_start) and @p data * pointer to clean up. */ -EAPI Ecore_Event_Filter *ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, const void *data); +ECORE_API Ecore_Event_Filter *ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, const void *data); /** * @brief Deletes an event filter. @@ -834,7 +834,7 @@ EAPI Ecore_Event_Filter *ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_ * * Delete a filter that has been added by its @p ef handle. */ -EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef); +ECORE_API void *ecore_event_filter_del(Ecore_Event_Filter *ef); /** * @brief Returns the current event type being handled. @@ -850,7 +850,7 @@ EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef); * the program know if the event type being handled is one it wants to get more * information about. */ -EAPI int ecore_event_current_type_get(void); +ECORE_API int ecore_event_current_type_get(void); /** * @brief Returns the current event type pointer handled. @@ -866,7 +866,7 @@ EAPI int ecore_event_current_type_get(void); * the program access the event data if the type of the event is handled by * the program. */ -EAPI void *ecore_event_current_event_get(void); +ECORE_API void *ecore_event_current_event_get(void); /** * @} @@ -931,7 +931,7 @@ typedef enum _Ecore_Memory_State Ecore_Memory_State; * @return The current memory state for the system as a whole. * @since 1.8 */ -EAPI Ecore_Memory_State ecore_memory_state_get(void); +ECORE_API Ecore_Memory_State ecore_memory_state_get(void); /** * @brief Sets the memory state. @@ -947,7 +947,7 @@ EAPI Ecore_Memory_State ecore_memory_state_get(void); * * @since 1.8 */ -EAPI void ecore_memory_state_set(Ecore_Memory_State state); +ECORE_API void ecore_memory_state_set(Ecore_Memory_State state); /** @@ -970,7 +970,7 @@ typedef enum _Ecore_Power_State Ecore_Power_State; * @return The current power state for the system. * @since 1.8 */ -EAPI Ecore_Power_State ecore_power_state_get(void); +ECORE_API Ecore_Power_State ecore_power_state_get(void); /** * @brief Sets the power state. @@ -986,7 +986,7 @@ EAPI Ecore_Power_State ecore_power_state_get(void); * * @since 1.8 */ -EAPI void ecore_power_state_set(Ecore_Power_State state); +ECORE_API void ecore_power_state_set(Ecore_Power_State state); /** * @} @@ -1014,10 +1014,10 @@ EAPI void ecore_power_state_set(Ecore_Power_State state); /** Inherit priority from parent process */ #define ECORE_EXE_PRIORITY_INHERIT 9999 -EAPI extern int ECORE_EXE_EVENT_ADD; /**< A child process has been added */ -EAPI extern int ECORE_EXE_EVENT_DEL; /**< A child process has been deleted (it exited, naming consistent with the rest of ecore). */ -EAPI extern int ECORE_EXE_EVENT_DATA; /**< Data from a child process. */ -EAPI extern int ECORE_EXE_EVENT_ERROR; /**< Errors from a child process. */ +ECORE_API extern int ECORE_EXE_EVENT_ADD; /**< A child process has been added */ +ECORE_API extern int ECORE_EXE_EVENT_DEL; /**< A child process has been deleted (it exited, naming consistent with the rest of ecore). */ +ECORE_API extern int ECORE_EXE_EVENT_DATA; /**< Data from a child process. */ +ECORE_API extern int ECORE_EXE_EVENT_ERROR; /**< Errors from a child process. */ /** * @enum _Ecore_Exe_Win32_Priority @@ -1093,7 +1093,7 @@ struct _Ecore_Exe_Event_Del * to @c 19 or @ref ECORE_EXE_PRIORITY_INHERIT on other OS. * */ -EAPI void ecore_exe_run_priority_set(int pri); +ECORE_API void ecore_exe_run_priority_set(int pri); /** * Gets the priority at which to launch processes. @@ -1104,7 +1104,7 @@ EAPI void ecore_exe_run_priority_set(int pri); * * @return The value set by ecore_exe_run_priority_set() */ -EAPI int ecore_exe_run_priority_get(void); +ECORE_API int ecore_exe_run_priority_get(void); /** * Spawns a child process. @@ -1119,7 +1119,7 @@ EAPI int ecore_exe_run_priority_get(void); * appropriated flags. * */ -EAPI Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data); +ECORE_API Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data); /** * Spawns a child process with its stdin/out available for communication. @@ -1146,7 +1146,7 @@ EAPI Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data); * @param data Data to attach to the returned process handle. * @return A process handle to the spawned process. */ -EAPI Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data); +ECORE_API Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data); /** * Defines a function to be called before really freeing the handle data. @@ -1161,7 +1161,7 @@ EAPI Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, c * @param exe The child process to attach the pre_free function. * @param func The function to call before @a exe is freed. */ -EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func); +ECORE_API void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func); /** * Sends data to the given child process which it receives on stdin. @@ -1175,14 +1175,14 @@ EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func); * @param size The size of the data to send, in bytes * @return @c EINA_TRUE if successful, @c EINA_FALSE on failure. */ -EAPI Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size); +ECORE_API Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size); /** * The stdin of the given child process will close when the write buffer is empty. * * @param exe The child process */ -EAPI void ecore_exe_close_stdin(Ecore_Exe *exe); +ECORE_API void ecore_exe_close_stdin(Ecore_Exe *exe); /** * Sets the auto pipe limits for the given process handle. On Windows @@ -1195,7 +1195,7 @@ EAPI void ecore_exe_close_stdin(Ecore_Exe *exe); * @param end_lines Limit of lines at end of output to buffer. * */ -EAPI void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines); +ECORE_API void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines); /** * Gets the auto pipe data for the given process handle @@ -1204,14 +1204,14 @@ EAPI void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_byt * @param flags Is this a ECORE_EXE_PIPE_READ or ECORE_EXE_PIPE_ERROR? * @return The event data. */ -EAPI Ecore_Exe_Event_Data *ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags); +ECORE_API Ecore_Exe_Event_Data *ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags); /** * Frees the given event data. * * @param data The given event data. */ -EAPI void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data); +ECORE_API void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data); /** * Frees the given process handle. @@ -1223,14 +1223,14 @@ EAPI void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data); * @return The data attached to the handle when @ref ecore_exe_run was * called. */ -EAPI void *ecore_exe_free(Ecore_Exe *exe); +ECORE_API void *ecore_exe_free(Ecore_Exe *exe); /** * Retrieves the process ID of the given spawned process. * @param exe Handle to the given spawned process. * @return The process ID on success, @c -1 otherwise. */ -EAPI pid_t ecore_exe_pid_get(const Ecore_Exe *exe); +ECORE_API pid_t ecore_exe_pid_get(const Ecore_Exe *exe); /** * Sets the string tag for the given process handle. @@ -1238,7 +1238,7 @@ EAPI pid_t ecore_exe_pid_get(const Ecore_Exe *exe); * @param exe The given process handle. * @param tag The string tag to set on the process handle. */ -EAPI void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag); +ECORE_API void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag); /** * Retrieves the tag attached to the given process handle. There is no need to @@ -1251,7 +1251,7 @@ EAPI void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag); * internal string and should not be modified, use * ecore_exe_tag_set() to change it. It might be @c NULL. */ -EAPI const char *ecore_exe_tag_get(const Ecore_Exe *exe); +ECORE_API const char *ecore_exe_tag_get(const Ecore_Exe *exe); /** * Retrieves the command of the given spawned process. @@ -1260,7 +1260,7 @@ EAPI const char *ecore_exe_tag_get(const Ecore_Exe *exe); * pointer to the internal value and must not be modified in * any way. */ -EAPI const char *ecore_exe_cmd_get(const Ecore_Exe *exe); +ECORE_API const char *ecore_exe_cmd_get(const Ecore_Exe *exe); /** * Retrieves the data attached to the given process handle. @@ -1268,7 +1268,7 @@ EAPI const char *ecore_exe_cmd_get(const Ecore_Exe *exe); * @return The data pointer attached to @p exe Given to * ecore_exe_run() or ecore_exe_pipe_run() */ -EAPI void *ecore_exe_data_get(const Ecore_Exe *exe); +ECORE_API void *ecore_exe_data_get(const Ecore_Exe *exe); /** * Sets the data attached to the given process handle. @@ -1278,50 +1278,50 @@ EAPI void *ecore_exe_data_get(const Ecore_Exe *exe); * ecore_exe_run(), ecore_exe_pipe_run(), or ecore_exe_data_set() * @since 1.1 */ -EAPI void *ecore_exe_data_set(Ecore_Exe *exe, void *data); +ECORE_API void *ecore_exe_data_set(Ecore_Exe *exe, void *data); /** * Retrieves the flags attached to the given process handle. * @param exe The given process handle. * @return The flags attached to @p exe. */ -EAPI Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *exe); +ECORE_API Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *exe); /** * Pauses the given process by sending it a @c SIGSTOP signal. * @param exe Process handle to the given process. */ -EAPI void ecore_exe_pause(Ecore_Exe *exe); +ECORE_API void ecore_exe_pause(Ecore_Exe *exe); /** * Continues the given paused process by sending it a @c SIGCONT signal. * @param exe Process handle to the given process. */ -EAPI void ecore_exe_continue(Ecore_Exe *exe); +ECORE_API void ecore_exe_continue(Ecore_Exe *exe); /** * Sends the given spawned process a interrupt (@c SIGINT) signal. * @param exe Process handle to the given process. */ -EAPI void ecore_exe_interrupt(Ecore_Exe *exe); +ECORE_API void ecore_exe_interrupt(Ecore_Exe *exe); /** * Sends the given spawned process a quit (@c SIGQUIT) signal. * @param exe Process handle to the given process. */ -EAPI void ecore_exe_quit(Ecore_Exe *exe); +ECORE_API void ecore_exe_quit(Ecore_Exe *exe); /** * Sends the given spawned process a terminate (@c SIGTERM) signal. * @param exe Process handle to the given process. */ -EAPI void ecore_exe_terminate(Ecore_Exe *exe); +ECORE_API void ecore_exe_terminate(Ecore_Exe *exe); /** * Kills the given spawned process by sending it a @c SIGKILL signal. * @param exe Process handle to the given process. */ -EAPI void ecore_exe_kill(Ecore_Exe *exe); +ECORE_API void ecore_exe_kill(Ecore_Exe *exe); /** * Sends a @c SIGUSR signal to the given spawned process. @@ -1329,13 +1329,13 @@ EAPI void ecore_exe_kill(Ecore_Exe *exe); * @param num The number user signal to send. Must be either @c 1 or @c 2, or * the signal will be ignored. */ -EAPI void ecore_exe_signal(Ecore_Exe *exe, int num); +ECORE_API void ecore_exe_signal(Ecore_Exe *exe, int num); /** * Sends a @c SIGHUP signal to the given spawned process. * @param exe Process handle to the given process. */ -EAPI void ecore_exe_hup(Ecore_Exe *exe); +ECORE_API void ecore_exe_hup(Ecore_Exe *exe); /** * @} @@ -1453,7 +1453,7 @@ typedef Eina_Bool (*Ecore_Win32_Handle_Cb)(void *data, Ecore_Win32_Handler *wh); * @warning This function should @b not be used for monitoring "normal" files, like text files. * */ -EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data); +ECORE_API Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data); /** * @brief Adds a callback for activity on the given file descriptor. @@ -1475,7 +1475,7 @@ EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags * * @since 1.7 */ -EAPI Ecore_Fd_Handler *ecore_main_fd_handler_file_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data); +ECORE_API Ecore_Fd_Handler *ecore_main_fd_handler_file_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data); /** * @brief Sets the prepare callback with data for a given #Ecore_Fd_Handler. @@ -1493,7 +1493,7 @@ EAPI Ecore_Fd_Handler *ecore_main_fd_handler_file_add(int fd, Ecore_Fd_Handler_F * @note You probably don't need this function. It is only necessary for very * uncommon cases that need special behavior. */ -EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data); +ECORE_API void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data); /** * @brief Marks an FD handler for deletion. * @param fd_handler The FD handler. @@ -1507,13 +1507,13 @@ EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handle * cause crashes and instability. Remember to delete your fd handlers before the * fds they listen to are closed. */ -EAPI void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler); +ECORE_API void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler); /** * @brief Retrieves the file descriptor that the given handler is handling. * @param fd_handler The given FD handler. * @return The file descriptor the handler is watching. */ -EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler); +ECORE_API int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler); /** * @brief Gets which flags are active on an FD handler. * @param fd_handler The given FD handler. @@ -1522,13 +1522,13 @@ EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler); * @return @c EINA_TRUE if any of the given flags are active, @c EINA_FALSE * otherwise. */ -EAPI Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); +ECORE_API Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); /** * @brief Sets what active streams the given FD handler should be monitoring. * @param fd_handler The given FD handler. * @param flags The flags to be watching. */ -EAPI void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); +ECORE_API void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); /** * @brief Creates a Ecore_Win32_Handler object and add it to the win32_handlers list. @@ -1536,14 +1536,14 @@ EAPI void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_F * @param func The function to add as a callback. * @param data The data to pass to the callback when it is called. */ -EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data); +ECORE_API Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data); /** * @brief Sets Ecore_Win32_Handler object to delete state. * The handler will be deleted in the _ecore_main_win32_handlers_cleanup function. * * @param win32_handler The Ecore_Win32_Handler object. */ -EAPI void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler); +ECORE_API void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler); /** * @} @@ -1575,7 +1575,7 @@ EAPI void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler); * @see ecore_loop_time_get(). * @see ecore_time_unix_get(). */ -EAPI double ecore_time_get(void); +ECORE_API double ecore_time_get(void); /** * Retrieves the current UNIX time as a floating point value in seconds. @@ -1585,7 +1585,7 @@ EAPI double ecore_time_get(void); * * @return The number of seconds since 12.00AM 1st January 1970. */ -EAPI double ecore_time_unix_get(void); +ECORE_API double ecore_time_unix_get(void); /** * Retrieves the time at which the last loop stopped waiting for timeouts or @@ -1608,7 +1608,7 @@ EAPI double ecore_time_unix_get(void); * defined is that it never goes backwards (unless you got big critical * messages when the application started). */ -EAPI double ecore_loop_time_get(void); +ECORE_API double ecore_loop_time_get(void); /** * Sets the loop time. @@ -1631,7 +1631,7 @@ EAPI double ecore_loop_time_get(void); * @see ecore_loop_time_get() * @since 1.11 */ -EAPI void ecore_loop_time_set(double t); +ECORE_API void ecore_loop_time_set(double t); /** * @} @@ -1798,7 +1798,7 @@ typedef void (*Ecore_Thread_Notify_Cb)(void *data, Ecore_Thread *thread, void *m * @see ecore_thread_reschedule() * @see ecore_thread_max_set() */ -EAPI Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data); +ECORE_API Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data); /** * Launches a thread to run a task that can talk back to the main thread. @@ -1840,7 +1840,7 @@ EAPI Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_ * @see ecore_thread_reschedule() * @see ecore_thread_max_set() */ -EAPI Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify, +ECORE_API Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data, Eina_Bool try_no_queue); @@ -1891,7 +1891,7 @@ EAPI Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_T * @see ecore_thread_check() * @see eina_thread_cancellable_run() */ -EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread); +ECORE_API Eina_Bool ecore_thread_cancel(Ecore_Thread *thread); /** * @brief Blocks the main loop until the thread execution is over. @@ -1904,7 +1904,7 @@ EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread); * Note: This function should only be called in the main loop. * */ -EAPI Eina_Bool ecore_thread_wait(Ecore_Thread *thread, double wait); +ECORE_API Eina_Bool ecore_thread_wait(Ecore_Thread *thread, double wait); /** * Checks if a thread is pending cancellation. @@ -1925,7 +1925,7 @@ EAPI Eina_Bool ecore_thread_wait(Ecore_Thread *thread, double wait); * * @see ecore_thread_cancel() */ -EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread); +ECORE_API Eina_Bool ecore_thread_check(Ecore_Thread *thread); /** * Sends data from the worker thread to the main loop. @@ -1948,7 +1948,7 @@ EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread); * * @see ecore_thread_feedback_run() */ -EAPI Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data); +ECORE_API Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data); /** * Asks for the function in the thread to be called again at a later time. @@ -1973,7 +1973,7 @@ EAPI Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data) * Similarly, if the @p thread is cancelled, the reschedule will not take * effect. */ -EAPI Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread); +ECORE_API Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread); /** * Gets the number of active threads running jobs. @@ -1988,7 +1988,7 @@ EAPI Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread); * in the return of this function unless the thread creation fails and it * falls back to using one from the pool. */ -EAPI int ecore_thread_active_get(void); +ECORE_API int ecore_thread_active_get(void); /** * Gets the number of short jobs waiting for a thread to run. @@ -1998,7 +1998,7 @@ EAPI int ecore_thread_active_get(void); * This returns the number of tasks started with ecore_thread_run() that are * pending, waiting for a thread to become available to run them. */ -EAPI int ecore_thread_pending_get(void); +ECORE_API int ecore_thread_pending_get(void); /** * Gets the number of feedback jobs waiting for a thread to run. @@ -2008,7 +2008,7 @@ EAPI int ecore_thread_pending_get(void); * This returns the number of tasks started with ecore_thread_feedback_run() * that are pending, waiting for a thread to become available to run them. */ -EAPI int ecore_thread_pending_feedback_get(void); +ECORE_API int ecore_thread_pending_feedback_get(void); /** * Gets the total number of pending jobs. @@ -2018,7 +2018,7 @@ EAPI int ecore_thread_pending_feedback_get(void); * Same as the sum of ecore_thread_pending_get() and *ecore_thread_pending_feedback_get(). */ -EAPI int ecore_thread_pending_total_get(void); +ECORE_API int ecore_thread_pending_total_get(void); /** * Gets the maximum number of threads that can run simultaneously. @@ -2038,7 +2038,7 @@ EAPI int ecore_thread_pending_total_get(void); * @see ecore_thread_max_set() * @see ecore_thread_max_reset() */ -EAPI int ecore_thread_max_get(void); +ECORE_API int ecore_thread_max_get(void); /** * Sets the maximum number of threads allowed to run simultaneously. @@ -2054,7 +2054,7 @@ EAPI int ecore_thread_max_get(void); * @see ecore_thread_max_get() * @see ecore_thread_max_reset() */ -EAPI void ecore_thread_max_set(int num); +ECORE_API void ecore_thread_max_set(int num); /** * Resets the maximum number of concurrently running threads to the default. @@ -2065,7 +2065,7 @@ EAPI void ecore_thread_max_set(int num); * @see ecore_thread_max_get() * @see ecore_thread_max_set() */ -EAPI void ecore_thread_max_reset(void); +ECORE_API void ecore_thread_max_reset(void); /** * Gets the number of threads available for running tasks. @@ -2078,7 +2078,7 @@ EAPI void ecore_thread_max_reset(void); * changed the maximum number of running threads while other tasks are * running. */ -EAPI int ecore_thread_available_get(void); +ECORE_API int ecore_thread_available_get(void); /** * Adds some data to a hash local to the thread. @@ -2164,7 +2164,7 @@ EAPI int ecore_thread_available_get(void); * @see ecore_thread_local_data_find() * @see ecore_thread_local_data_del() */ -EAPI Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value, +ECORE_API Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct); /** @@ -2194,7 +2194,7 @@ EAPI Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key * @see ecore_thread_local_data_del() * @see ecore_thread_local_data_find() */ -EAPI void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb); +ECORE_API void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb); /** * Gets data stored in the hash local to the given thread. @@ -2213,7 +2213,7 @@ EAPI void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, vo * @see ecore_thread_local_data_add() * @see ecore_thread_local_data_wait() */ -EAPI void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key); +ECORE_API void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key); /** * Deletes from the thread's hash the data corresponding to the given key. @@ -2239,7 +2239,7 @@ EAPI void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key); * * @see ecore_thread_local_data_add() */ -EAPI Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key); +ECORE_API Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key); /** * Adds some data to a hash shared by all threads. @@ -2279,7 +2279,7 @@ EAPI Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key * @see ecore_thread_global_data_set() * @see ecore_thread_global_data_find() */ -EAPI Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct); +ECORE_API Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct); /** * Sets some data in the hash shared by all threads. @@ -2302,7 +2302,7 @@ EAPI Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_F * @see ecore_thread_global_data_del() * @see ecore_thread_global_data_find() */ -EAPI void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb); +ECORE_API void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb); /** * Gets data stored in the hash shared by all threads. @@ -2320,7 +2320,7 @@ EAPI void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_ * @see ecore_thread_global_data_add() * @see ecore_thread_global_data_wait() */ -EAPI void *ecore_thread_global_data_find(const char *key); +ECORE_API void *ecore_thread_global_data_find(const char *key); /** * Deletes from the shared hash the data corresponding to the given key. @@ -2344,7 +2344,7 @@ EAPI void *ecore_thread_global_data_find(const char *key); * * @see ecore_thread_global_data_add() */ -EAPI Eina_Bool ecore_thread_global_data_del(const char *key); +ECORE_API Eina_Bool ecore_thread_global_data_del(const char *key); /** * Gets data stored in the shared hash, or wait for it if it doesn't exist. @@ -2373,7 +2373,7 @@ EAPI Eina_Bool ecore_thread_global_data_del(const char *key); * @see ecore_thread_global_data_add() * @see ecore_thread_global_data_find() */ -EAPI void *ecore_thread_global_data_wait(const char *key, double seconds); +ECORE_API void *ecore_thread_global_data_wait(const char *key, double seconds); /** * @} @@ -2418,7 +2418,7 @@ typedef void (*Ecore_Pipe_Cb)(void *data, void *buffer, unsigned int nbyte); * @return A newly created Ecore_Pipe object if successful, * @c NULL otherwise. */ -EAPI Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data); +ECORE_API Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data); /** * Creates a pipe with more parameters. @@ -2435,7 +2435,7 @@ EAPI Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data); * @return A pointer to the new Ecore_Pipe object on success, else NULL. * @see ecore_pipe_add() */ -EAPI Ecore_Pipe *ecore_pipe_full_add(Ecore_Pipe_Cb handler, +ECORE_API Ecore_Pipe *ecore_pipe_full_add(Ecore_Pipe_Cb handler, const void *data, int fd_read, int fd_write, Eina_Bool read_survive_fork, @@ -2447,7 +2447,7 @@ EAPI Ecore_Pipe *ecore_pipe_full_add(Ecore_Pipe_Cb handler, * @param p The Ecore_Pipe object to be freed. * @return The pointer to the private data */ -EAPI void *ecore_pipe_del(Ecore_Pipe *p); +ECORE_API void *ecore_pipe_del(Ecore_Pipe *p); /** * Writes on the file descriptor the data passed as parameter. @@ -2457,21 +2457,21 @@ EAPI void *ecore_pipe_del(Ecore_Pipe *p); * @param nbytes The size of the @p buffer in bytes. * @return @c EINA_TRUE on a successful write, @c EINA_FALSE on error. */ -EAPI Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes); +ECORE_API Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes); /** * Closes the write end of an Ecore_Pipe object created with ecore_pipe_add(). * * @param p The Ecore_Pipe object. */ -EAPI void ecore_pipe_write_close(Ecore_Pipe *p); +ECORE_API void ecore_pipe_write_close(Ecore_Pipe *p); /** * Closes the read end of an Ecore_Pipe object created with ecore_pipe_add(). * * @param p The Ecore_Pipe object. */ -EAPI void ecore_pipe_read_close(Ecore_Pipe *p); +ECORE_API void ecore_pipe_read_close(Ecore_Pipe *p); /** * Gets the pipe read file descriptor. @@ -2479,7 +2479,7 @@ EAPI void ecore_pipe_read_close(Ecore_Pipe *p); * @param p The Ecore_Pipe object query. * @return The file descriptor, or @c -1 if none */ -EAPI int ecore_pipe_read_fd(Ecore_Pipe *p); +ECORE_API int ecore_pipe_read_fd(Ecore_Pipe *p); /** * Gets the pipe write file descriptor. @@ -2487,7 +2487,7 @@ EAPI int ecore_pipe_read_fd(Ecore_Pipe *p); * @param p The Ecore_Pipe object query. * @return The file descriptor, or @c -1 if none */ -EAPI int ecore_pipe_write_fd(Ecore_Pipe *p); +ECORE_API int ecore_pipe_write_fd(Ecore_Pipe *p); /** * Starts monitoring again the pipe for reading. See ecore_pipe_freeze() for @@ -2497,7 +2497,7 @@ EAPI int ecore_pipe_write_fd(Ecore_Pipe *p); * @param p The Ecore_Pipe object. * @since 1.1 */ -EAPI void ecore_pipe_thaw(Ecore_Pipe *p); +ECORE_API void ecore_pipe_thaw(Ecore_Pipe *p); /** * Stops monitoring if necessary the pipe for reading. See ecore_pipe_thaw() @@ -2506,7 +2506,7 @@ EAPI void ecore_pipe_thaw(Ecore_Pipe *p); * @param p The Ecore_Pipe object. * @since 1.1 */ -EAPI void ecore_pipe_freeze(Ecore_Pipe *p); +ECORE_API void ecore_pipe_freeze(Ecore_Pipe *p); /** * @brief Waits from another thread on the read side of a pipe. @@ -2519,7 +2519,7 @@ EAPI void ecore_pipe_freeze(Ecore_Pipe *p); * * Negative value for @p wait means infite wait. */ -EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait); +ECORE_API int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait); /** * @} @@ -2540,7 +2540,7 @@ EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait); * A call to this function will store the programs command-line arguments * for later use by ecore_app_restart() or ecore_app_args_get(). */ -EAPI void ecore_app_args_set(int argc, const char **argv); +ECORE_API void ecore_app_args_set(int argc, const char **argv); /** * Returns the programs stored command-line arguments. @@ -2553,7 +2553,7 @@ EAPI void ecore_app_args_set(int argc, const char **argv); * also if the pointer is not NULL. The values they are filled with will be the * same set by ecore_app_args_set(). */ -EAPI void ecore_app_args_get(int *argc, char ***argv); +ECORE_API void ecore_app_args_get(int *argc, char ***argv); /** * Restarts the program executable with the command-line arguments stored. @@ -2563,7 +2563,7 @@ EAPI void ecore_app_args_get(int *argc, char ***argv); * an easy way for a program to restart itself for cleanup purposes, * configuration reasons or in the event of a crash. */ -EAPI void ecore_app_restart(void); +ECORE_API void ecore_app_restart(void); /** * @brief Do not load system modules for this application. @@ -2582,7 +2582,7 @@ EAPI void ecore_app_restart(void); * * @since 1.8 */ -EAPI void ecore_app_no_system_modules(void); +ECORE_API void ecore_app_no_system_modules(void); /** * @} @@ -2642,7 +2642,7 @@ EAPI void ecore_app_no_system_modules(void); * * @param amount Amount (in seconds) to adjust by */ -EAPI void ecore_throttle_adjust(double amount); +ECORE_API void ecore_throttle_adjust(double amount); /** * Gets current throttle level. @@ -2653,7 +2653,7 @@ EAPI void ecore_throttle_adjust(double amount); * * @return The current throttle level. */ -EAPI double ecore_throttle_get(void); +ECORE_API double ecore_throttle_get(void); /** * @} @@ -2796,7 +2796,7 @@ typedef enum * * @note The default @p frametime value is 1/60th of a second. */ -EAPI void ecore_animator_frametime_set(double frametime); +ECORE_API void ecore_animator_frametime_set(double frametime); /** * @brief Gets the animator call interval in seconds. @@ -2807,7 +2807,7 @@ EAPI void ecore_animator_frametime_set(double frametime); * * @see ecore_animator_frametime_set() */ -EAPI double ecore_animator_frametime_get(void); +ECORE_API double ecore_animator_frametime_get(void); /** * @brief Maps an input position from 0.0 to 1.0 along a timeline to a @@ -2869,7 +2869,7 @@ EAPI double ecore_animator_frametime_get(void); * * @since 1.1.0 */ -EAPI double ecore_animator_pos_map(double pos, Ecore_Pos_Map map, double v1, double v2); +ECORE_API double ecore_animator_pos_map(double pos, Ecore_Pos_Map map, double v1, double v2); /** * @brief Maps an input position from 0.0 to 1.0 along a timeline to a @@ -2933,7 +2933,7 @@ EAPI double ecore_animator_pos_map(double pos, Ecore_Pos_Map map, double v1, dou * * @see Ecore_Pos_Map */ -EAPI double ecore_animator_pos_map_n(double pos, Ecore_Pos_Map map, int v_size, double *v); +ECORE_API double ecore_animator_pos_map_n(double pos, Ecore_Pos_Map map, int v_size, double *v); /** * @brief Sets the source of animator ticks for the mainloop. @@ -2959,7 +2959,7 @@ EAPI double ecore_animator_pos_map_n(double pos, Ecore_Pos_Map map, int v_size, * * @see ecore_animator_source_get() */ -EAPI void ecore_animator_source_set(Ecore_Animator_Source source); +ECORE_API void ecore_animator_source_set(Ecore_Animator_Source source); /** * @brief Gets the animator source currently set. @@ -2970,7 +2970,7 @@ EAPI void ecore_animator_source_set(Ecore_Animator_Source source); * * @see ecore_animator_source_set() */ -EAPI Ecore_Animator_Source ecore_animator_source_get(void); +ECORE_API Ecore_Animator_Source ecore_animator_source_get(void); /** * @brief Sets the function that begins a custom animator tick source. @@ -2993,7 +2993,7 @@ EAPI Ecore_Animator_Source ecore_animator_source_get(void); * @see ecore_animator_custom_source_tick_end_callback_set() * @see ecore_animator_custom_tick() */ -EAPI void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, const void *data); +ECORE_API void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, const void *data); /** * @brief Sets the function that ends a custom animator tick source. @@ -3013,7 +3013,7 @@ EAPI void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, co * @see ecore_animator_custom_source_tick_begin_callback_set() * @see ecore_animator_custom_tick() */ -EAPI void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, const void *data); +ECORE_API void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, const void *data); /** * @brief Triggers a custom animator tick. @@ -3030,7 +3030,7 @@ EAPI void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, cons * @see ecore_animator_custom_source_tick_begin_callback_set * @see ecore_animator_custom_source_tick_end_callback_set()() */ -EAPI void ecore_animator_custom_tick(void); +ECORE_API void ecore_animator_custom_tick(void); /** * @} @@ -3071,7 +3071,7 @@ typedef Eo Ecore_Timer; /**< A handle for timers */ * @return Current precision. * @see ecore_timer_precision_set() */ -EAPI double ecore_timer_precision_get(void); +ECORE_API double ecore_timer_precision_get(void); /** * @brief Sets the precision to be used by timer infrastructure. @@ -3098,7 +3098,7 @@ EAPI double ecore_timer_precision_get(void); * precision range, if it does not, in our example if no second timer * in (T + precision) existed, then it would use the minimum timeout. */ -EAPI void ecore_timer_precision_set(double precision); +ECORE_API void ecore_timer_precision_set(double precision); /** * This function returns a human readable text-based log for Ecore_Timer events. @@ -3109,7 +3109,7 @@ EAPI void ecore_timer_precision_set(double precision); * It only contains an useful implementation if EFL is built in debug build * profile, but it's safe to call it for any build profile. */ -EAPI char *ecore_timer_dump(void); +ECORE_API char *ecore_timer_dump(void); /** * @} diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h index 90a0cc38e5..bf38c8617a 100644 --- a/src/lib/ecore/Ecore_Eo.h +++ b/src/lib/ecore/Ecore_Eo.h @@ -45,9 +45,9 @@ /* To be deprecated at some point */ /** Please use efl_provider_register instead. */ -EAPI Eina_Bool efl_loop_register(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider); +ECORE_API Eina_Bool efl_loop_register(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider); /** Please use efl_provider_unregister instead. */ -EAPI Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider); +ECORE_API Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider); /** * @brief Quits the main loop once all the events currently on the queue have @@ -59,9 +59,9 @@ EAPI Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, const * * @ingroup Efl_Loop */ -EAPI void efl_exit(int exit_code); +ECORE_API void efl_exit(int exit_code); -EAPI int efl_loop_exit_code_process(Eina_Value *value); +ECORE_API int efl_loop_exit_code_process(Eina_Value *value); #include "efl_loop_consumer.eo.h" @@ -71,7 +71,7 @@ EAPI int efl_loop_exit_code_process(Eina_Value *value); * @param[in] obj An object which is either a loop or a loop consumer * @return The current loop's future scheduler. */ -EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj); +ECORE_API Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj); #include "efl_loop_fd.eo.h" #include "efl_loop_handler.eo.h" @@ -86,7 +86,7 @@ EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj); #include "efl_cubic_bezier_interpolator.eo.h" /* We ue the factory pattern here, so you shouldn't call eo_add directly. */ -EAPI Eo *efl_main_loop_get(void); +ECORE_API Eo *efl_main_loop_get(void); /** * @} diff --git a/src/lib/ecore/Ecore_Getopt.h b/src/lib/ecore/Ecore_Getopt.h index 751d30c788..c7729d2832 100644 --- a/src/lib/ecore/Ecore_Getopt.h +++ b/src/lib/ecore/Ecore_Getopt.h @@ -3,32 +3,7 @@ #include <stdio.h> #include <Eina.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 <ecore_api.h> /** * @ingroup Ecore @@ -1025,7 +1000,7 @@ struct _Ecore_Getopt * * @see ecore_getopt_help_category() */ -EAPI void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info); +ECORE_API void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info); /** * Shows help for a single category (along with program usage and description). @@ -1038,7 +1013,7 @@ EAPI void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info); * * @see ecore_getopt_help() */ -EAPI Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *info, const char *category); +ECORE_API Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *info, const char *category); /** * Checks parser for duplicate entries, print them out. @@ -1046,7 +1021,7 @@ EAPI Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *info, c * @return @c EINA_TRUE if there are duplicates, @c EINA_FALSE otherwise. * @param parser The parser to be checked. */ -EAPI Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser); +ECORE_API Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser); /** * Parses command line parameters. @@ -1110,7 +1085,7 @@ EAPI Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser); * * @see ecore_getopt_parse_positional() */ -EAPI int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv); +ECORE_API int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv); /** * Parses command line positional parameters. @@ -1163,7 +1138,7 @@ EAPI int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Valu * last positional argument is of action @c * ECORE_GETOPT_ACTION_APPEND then it will be the same as @a argc. */ -EAPI int ecore_getopt_parse_positional(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int start); +ECORE_API int ecore_getopt_parse_positional(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int start); /** @@ -1172,7 +1147,7 @@ EAPI int ecore_getopt_parse_positional(const Ecore_Getopt *parser, Ecore_ * @param list Pointer to list to be freed. * @return always @c NULL, so you can easily make your list head @c NULL. */ -EAPI Eina_List *ecore_getopt_list_free(Eina_List *list); +ECORE_API Eina_List *ecore_getopt_list_free(Eina_List *list); /** * Helper ecore_getopt callback to parse geometry (x:y:w:h). @@ -1189,7 +1164,7 @@ EAPI Eina_List *ecore_getopt_list_free(Eina_List *list); * * @c callback_data value is ignored, you can safely use @c NULL. */ -EAPI Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage); +ECORE_API Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage); /** * Helper ecore_getopt callback to parse geometry size (WxH). @@ -1205,7 +1180,7 @@ EAPI Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, * * @c callback_data value is ignored, you can safely use @c NULL. */ -EAPI Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage); +ECORE_API Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage); #ifdef __cplusplus } @@ -1215,7 +1190,4 @@ EAPI Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser, con * @} */ -#undef EAPI -#define EAPI - #endif /* _ECORE_GETOPT_H */ diff --git a/src/lib/ecore/Ecore_Legacy.h b/src/lib/ecore/Ecore_Legacy.h index e4ed2773c1..dbb7181b6c 100644 --- a/src/lib/ecore/Ecore_Legacy.h +++ b/src/lib/ecore/Ecore_Legacy.h @@ -38,7 +38,7 @@ typedef struct _Ecore_Poller Ecore_Poller; * @c 0 it will be deleted automatically making any references/handles for it * invalid. */ -EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data); /** * @brief Deletes the specified poller from the timer list. @@ -49,7 +49,7 @@ EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_ * @note @a poller must be a valid handle. If the poller function has already * returned @c 0, the handle is no longer valid (and does not need to be deleted). */ -EAPI void *ecore_poller_del(Ecore_Poller *poller); +ECORE_API void *ecore_poller_del(Ecore_Poller *poller); /** * @brief Sets the time(in seconds) between ticks for the given poller type. @@ -59,7 +59,7 @@ EAPI void *ecore_poller_del(Ecore_Poller *poller); * This will adjust the time between ticks of the given timer type defined by * @p type to the time period defined by @p poll_time. */ -EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time); +ECORE_API void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time); /** * @brief Gets the time(in seconds) between ticks for the given poller type. @@ -68,7 +68,7 @@ EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_tim * * This will get the time between ticks of the specified poller timer. */ -EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type); +ECORE_API double ecore_poller_poll_interval_get(Ecore_Poller_Type type); /** * @brief Polling interval rate of the poller. @@ -77,14 +77,14 @@ EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type); * * @return @c true on success, @c false on failure. */ -EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *obj, int interval); +ECORE_API Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *obj, int interval); /** * @brief Polling interval rate of the poller. * * @return The tick interval; must be a power of 2 and <= 32768. */ -EAPI int ecore_poller_poller_interval_get(const Ecore_Poller *obj); +ECORE_API int ecore_poller_poller_interval_get(const Ecore_Poller *obj); /** * @} @@ -125,7 +125,7 @@ typedef struct _Ecore_Animator Ecore_Animator; * @note The default @p frametime value is 1/30th of a second. * */ -EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data); /** * @brief Adds an animator that runs for a limited time. @@ -157,7 +157,7 @@ EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data); * * @since 1.1.0 */ -EAPI Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data); +ECORE_API Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data); /** * @brief Deletes the specified animator from the animator list. @@ -172,7 +172,7 @@ EAPI Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_ * is invalid and should not be used again. It will not get called again after * deletion. */ -EAPI void *ecore_animator_del(Ecore_Animator *animator); +ECORE_API void *ecore_animator_del(Ecore_Animator *animator); /** * @brief Suspends the specified animator. @@ -188,7 +188,7 @@ EAPI void *ecore_animator_del(Ecore_Animator *animator); * will increase as if the animator hadn't been frozen and the animator may * have it's execution halted if @p runtime elapsed. */ -EAPI void ecore_animator_freeze(Ecore_Animator *animator); +ECORE_API void ecore_animator_freeze(Ecore_Animator *animator); /** * @brief Restores execution of the specified animator. @@ -198,7 +198,7 @@ EAPI void ecore_animator_freeze(Ecore_Animator *animator); * The specified @p animator will be put back in the set of animators that are * executed during main loop. */ -EAPI void ecore_animator_thaw(Ecore_Animator *animator); +ECORE_API void ecore_animator_thaw(Ecore_Animator *animator); /** * @} @@ -228,7 +228,7 @@ EAPI void ecore_animator_thaw(Ecore_Animator *animator); * @c 0 it will be deleted automatically making any references/handles for it * invalid. */ -EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data); /** * Creates a timer to call the given function in the given period of time. @@ -242,7 +242,7 @@ EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *dat * ecore_loop_time_get() not ecore_time_get() as ecore_timer_add() uses. See * ecore_timer_add() for more details. */ -EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data); /** * Deletes the specified timer from the timer list. @@ -253,7 +253,7 @@ EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void * Note: @p timer must be a valid handle. If the timer function has already * returned @c 0, the handle is no longer valid (and does not need to be delete). */ -EAPI void *ecore_timer_del(Ecore_Timer *timer); +ECORE_API void *ecore_timer_del(Ecore_Timer *timer); /** * Pauses a running timer. @@ -269,7 +269,7 @@ EAPI void *ecore_timer_del(Ecore_Timer *timer); * * @see ecore_timer_thaw() */ -EAPI void ecore_timer_freeze(Ecore_Timer *timer); +ECORE_API void ecore_timer_freeze(Ecore_Timer *timer); /** * @brief Return whether the timer is freezing. @@ -278,7 +278,7 @@ EAPI void ecore_timer_freeze(Ecore_Timer *timer); * * @see ecore_timer_freeze(), ecore_timer_thaw() */ -EAPI Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer); +ECORE_API Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer); /** * @brief Resumes a frozen (paused) timer. @@ -293,7 +293,7 @@ EAPI Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer); * * @see ecore_timer_freeze() */ -EAPI void ecore_timer_thaw(Ecore_Timer *timer); +ECORE_API void ecore_timer_thaw(Ecore_Timer *timer); #include "efl_loop_timer_eo.legacy.h" @@ -321,7 +321,7 @@ EAPI void ecore_timer_thaw(Ecore_Timer *timer); * * Idlers are useful for progressively processing data without blocking. */ -EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data); /** * Deletes an idler callback from the list to be executed. @@ -329,7 +329,7 @@ EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data); * @return The data pointer passed to the idler callback on success, @c NULL * otherwise. */ -EAPI void *ecore_idler_del(Ecore_Idler *idler); +ECORE_API void *ecore_idler_del(Ecore_Idler *idler); /** * Adds an idle enterer handler. @@ -341,7 +341,7 @@ EAPI void *ecore_idler_del(Ecore_Idler *idler); * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle enterer. */ -EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data); /** * Adds an idle enterer handler at the start of the list so it gets called earlier than others. @@ -353,7 +353,7 @@ EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void * * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle enterer. */ -EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data); /** * Deletes an idle enterer callback. @@ -361,7 +361,7 @@ EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const * @return The data pointer passed to the idler enterer callback on success. * @c NULL otherwise. */ -EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer); +ECORE_API void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer); /** * Adds an idle exiter handler. @@ -372,7 +372,7 @@ EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer); * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle exiter. */ -EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data); /** * Deletes an idle exiter handler from the list to be run on exiting idle state. @@ -380,7 +380,7 @@ EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *da * @return The data pointer that was being being passed to the handler if * successful. @c NULL otherwise. */ -EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter); +ECORE_API void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter); /** * @} @@ -412,22 +412,22 @@ EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter); * added to the queue. * @note Once the job has been executed, the job handle is invalid. */ -EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data); +ECORE_API Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data); /** * Deletes a queued job that has not yet been executed. * @param obj Handle of the job to delete. * @return The data pointer that was to be passed to the job. */ -EAPI void *ecore_job_del(Ecore_Job *obj); +ECORE_API void *ecore_job_del(Ecore_Job *obj); /** * @} */ #ifdef EFL_BETA_API_SUPPORT -EAPI Ecore_Animator *ecore_evas_animator_timeline_add(void *evo, double runtime, Ecore_Timeline_Cb func, const void *data); -EAPI Ecore_Animator *ecore_evas_animator_add(void *evo, Ecore_Task_Cb func, const void *data); +ECORE_API Ecore_Animator *ecore_evas_animator_timeline_add(void *evo, double runtime, Ecore_Timeline_Cb func, const void *data); +ECORE_API Ecore_Animator *ecore_evas_animator_add(void *evo, Ecore_Task_Cb func, const void *data); #endif /* EFL_BETA_API_SUPPORT */ #endif diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h index 7e80819b83..b2b6896f65 100644 --- a/src/lib/ecore/Efl_Core.h +++ b/src/lib/ecore/Efl_Core.h @@ -6,31 +6,8 @@ #include <Eina.h> #include <Eo.h> #include <Efl.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 <ecore_api.h> #ifdef _WIN32 # define WIN32_LEAN_AND_MEAN @@ -54,7 +31,7 @@ extern "C" { #endif -EAPI extern double _efl_startup_time; +ECORE_API extern double _efl_startup_time; #include "Ecore_Common.h" #include "Ecore_Eo.h" @@ -63,9 +40,6 @@ EAPI extern double _efl_startup_time; } #endif -#undef EAPI -#define EAPI - #endif // We are including efl_general.h again, just in case Efl_Core.h was already included before this diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c index 0d79b621b2..a5014d6b46 100644 --- a/src/lib/ecore/ecore.c +++ b/src/lib/ecore/ecore.c @@ -41,9 +41,9 @@ #endif static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV }; -EAPI Ecore_Version *ecore_version = &_version; +ECORE_API Ecore_Version *ecore_version = &_version; -EAPI double _efl_startup_time = 0; +ECORE_API double _efl_startup_time = 0; #if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) #define KEEP_MAX(Global, Local) \ @@ -215,13 +215,13 @@ _efl_first_loop_iterate(void *data, const Efl_Event *event) _efl_first_loop_iterate, data); } -EAPI void +ECORE_API void ecore_app_no_system_modules(void) { _no_system_modules = EINA_TRUE; } -EAPI int +ECORE_API int ecore_init(void) { if (++_ecore_init_count != 1) @@ -362,7 +362,7 @@ shutdown_evil: return --_ecore_init_count; } -EAPI int +ECORE_API int ecore_shutdown(void) { Ecore_Pipe *p; @@ -470,7 +470,7 @@ ecore_shutdown(void) static unsigned int _ecore_init_ex = 0; -EAPI unsigned int +ECORE_API unsigned int ecore_init_ex(int argc, char **argv) { if (_ecore_init_ex++ != 0) return _ecore_init_ex; @@ -483,7 +483,7 @@ ecore_init_ex(int argc, char **argv) return _ecore_init_ex; } -EAPI unsigned int +ECORE_API unsigned int ecore_shutdown_ex(void) { if (--_ecore_init_ex != 0) return _ecore_init_ex; @@ -505,7 +505,7 @@ typedef struct _Ecore_Fork_Cb Ecore_Fork_Cb; static int fork_cbs_walking = 0; static Eina_List *fork_cbs = NULL; -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_fork_reset_callback_add(Ecore_Cb func, const void *data) { Ecore_Fork_Cb *fcb; @@ -519,7 +519,7 @@ ecore_fork_reset_callback_add(Ecore_Cb func, const void *data) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_fork_reset_callback_del(Ecore_Cb func, const void *data) { Eina_List *l; @@ -542,7 +542,7 @@ ecore_fork_reset_callback_del(Ecore_Cb func, const void *data) return EINA_FALSE; } -EAPI void +ECORE_API void ecore_fork_reset(void) { Eina_List *l, *ln; @@ -597,7 +597,7 @@ ecore_fork_reset(void) #endif } -EAPI void +ECORE_API void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data) { @@ -622,7 +622,7 @@ ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, _ecore_main_loop_thread_safe_call(order); } -EAPI void * +ECORE_API void * ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data) { @@ -662,7 +662,7 @@ ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, return ret; } -EAPI void +ECORE_API void ecore_main_loop_thread_safe_call_wait(double wait) { ecore_pipe_wait(_thread_call, 1, wait); @@ -670,7 +670,7 @@ ecore_main_loop_thread_safe_call_wait(double wait) static Efl_Id_Domain _ecore_main_domain = EFL_ID_DOMAIN_INVALID; -EAPI int +ECORE_API int ecore_thread_main_loop_begin(void) { Ecore_Safe_Call *order; @@ -720,7 +720,7 @@ ecore_thread_main_loop_begin(void) return _thread_loop; } -EAPI int +ECORE_API int ecore_thread_main_loop_end(void) { int current_id; @@ -763,7 +763,7 @@ ecore_thread_main_loop_end(void) return 0; } -EAPI void +ECORE_API void ecore_print_warning(const char *function EINA_UNUSED, const char *sparam EINA_UNUSED) { @@ -776,7 +776,7 @@ ecore_print_warning(const char *function EINA_UNUSED, if (getenv("ECORE_ERROR_ABORT")) abort(); } -EAPI void +ECORE_API void _ecore_magic_fail(const void *d, Ecore_Magic m, Ecore_Magic req_m, @@ -1092,13 +1092,13 @@ _thread_callback(void *data EINA_UNUSED, _ecore_main_call_flush(); } -EAPI Ecore_Power_State +ECORE_API Ecore_Power_State ecore_power_state_get(void) { return _ecore_power_state; } -EAPI void +ECORE_API void ecore_power_state_set(Ecore_Power_State state) { if (_ecore_power_state == state) return; @@ -1106,13 +1106,13 @@ ecore_power_state_set(Ecore_Power_State state) ecore_event_add(ECORE_EVENT_POWER_STATE, NULL, NULL, NULL); } -EAPI Ecore_Memory_State +ECORE_API Ecore_Memory_State ecore_memory_state_get(void) { return _ecore_memory_state; } -EAPI void +ECORE_API void ecore_memory_state_set(Ecore_Memory_State state) { if (_ecore_memory_state == state) return; diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c index a5bde81ff6..25de52db68 100644 --- a/src/lib/ecore/ecore_anim.c +++ b/src/lib/ecore/ecore_anim.c @@ -534,14 +534,14 @@ _ecore_animator_add(Ecore_Task_Cb func, return animator; } -EAPI Ecore_Animator * +ECORE_API Ecore_Animator * ecore_animator_add(Ecore_Task_Cb func, const void *data) { return _ecore_animator_add(func, data); } -EAPI Ecore_Animator * +ECORE_API Ecore_Animator * ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data) @@ -747,7 +747,7 @@ _pos_map_cubic_bezier(double pos, #define SUB(A, B) eina_f32p32_sub(A, B) #define MUL(A, B) eina_f32p32_mul(A, B) -EAPI double +ECORE_API double ecore_animator_pos_map_n(double pos, Ecore_Pos_Map map, int v_size, @@ -830,7 +830,7 @@ ecore_animator_pos_map_n(double pos, return pos; } -EAPI double +ECORE_API double ecore_animator_pos_map(double pos, Ecore_Pos_Map map, double v1, @@ -843,7 +843,7 @@ ecore_animator_pos_map(double pos, return ecore_animator_pos_map_n(pos, map, 2, v); } -EAPI void * +ECORE_API void * ecore_animator_del(Ecore_Animator *animator) { void *data = NULL; @@ -871,7 +871,7 @@ ecore_animator_del(Ecore_Animator *animator) return data; } -EAPI void +ECORE_API void ecore_animator_frametime_set(double frametime) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -882,14 +882,14 @@ ecore_animator_frametime_set(double frametime) if (_have_animators()) _begin_tick(); } -EAPI double +ECORE_API double ecore_animator_frametime_get(void) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0); return animators_frametime; } -EAPI void +ECORE_API void ecore_animator_freeze(Ecore_Animator *animator) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -907,7 +907,7 @@ ecore_animator_freeze(Ecore_Animator *animator) if (!_have_animators()) _end_tick(); } -EAPI void +ECORE_API void ecore_animator_thaw(Ecore_Animator *animator) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -925,7 +925,7 @@ ecore_animator_thaw(Ecore_Animator *animator) if (_have_animators()) _begin_tick(); } -EAPI void +ECORE_API void ecore_animator_source_set(Ecore_Animator_Source source) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -938,14 +938,14 @@ ecore_animator_source_set(Ecore_Animator_Source source) if (_have_animators()) _begin_tick(); } -EAPI Ecore_Animator_Source +ECORE_API Ecore_Animator_Source ecore_animator_source_get(void) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); return src; } -EAPI void +ECORE_API void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, const void *data) { @@ -956,7 +956,7 @@ ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, if (_have_animators()) _begin_tick(); } -EAPI void +ECORE_API void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, const void *data) { @@ -967,7 +967,7 @@ ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, if (_have_animators()) _begin_tick(); } -EAPI void +ECORE_API void ecore_animator_custom_tick(void) { EINA_MAIN_LOOP_CHECK_RETURN; diff --git a/src/lib/ecore/ecore_api.h b/src/lib/ecore/ecore_api.h new file mode 100644 index 0000000000..34bf7f8a44 --- /dev/null +++ b/src/lib/ecore/ecore_api.h @@ -0,0 +1,34 @@ +#ifndef _EFL_CORE_API_H +#define _EFL_CORE_API_H + +#ifdef ECORE_API +#error ECORE_API should not be already defined +#endif + +#ifdef _WIN32 +# ifndef ECORE_STATIC +# ifdef ECORE_BUILD +# define ECORE_API __declspec(dllexport) +# else +# define ECORE_API __declspec(dllimport) +# endif +# else +# define ECORE_API +# endif +# define ECORE_API_WEAK +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define ECORE_API __attribute__ ((visibility("default"))) +# define ECORE_API_WEAK __attribute__ ((weak)) +# else +# define ECORE_API +# define ECORE_API_WEAK +# endif +# else +# define ECORE_API +# define ECORE_API_WEAK +# endif +#endif + +#endif diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c index 605f046534..df5d78751a 100644 --- a/src/lib/ecore/ecore_app.c +++ b/src/lib/ecore/ecore_app.c @@ -11,7 +11,7 @@ static int app_argc = 0; static char **app_argv = NULL; -EAPI void +ECORE_API void ecore_app_args_set(int argc, const char **argv) { @@ -25,7 +25,7 @@ ecore_app_args_set(int argc, app_argv = (char **)argv; } -EAPI void +ECORE_API void ecore_app_args_get(int *argc, char ***argv) { @@ -35,7 +35,7 @@ ecore_app_args_get(int *argc, if (argv) *argv = app_argv; } -EAPI void +ECORE_API void ecore_app_restart(void) { EINA_MAIN_LOOP_CHECK_RETURN; diff --git a/src/lib/ecore/ecore_events.c b/src/lib/ecore/ecore_events.c index b0a6607d6a..917382f3b1 100644 --- a/src/lib/ecore/ecore_events.c +++ b/src/lib/ecore/ecore_events.c @@ -9,7 +9,7 @@ static Ecore_Event_Message_Handler *_event_msg_handler = NULL; -EAPI Ecore_Event_Handler * +ECORE_API Ecore_Event_Handler * ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data) @@ -18,7 +18,7 @@ ecore_event_handler_add(int type, type, func, (void *)data); } -EAPI Ecore_Event_Handler * +ECORE_API Ecore_Event_Handler * ecore_event_handler_prepend(int type, Ecore_Event_Handler_Cb func, const void *data) @@ -27,20 +27,20 @@ ecore_event_handler_prepend(int type, type, func, (void *)data); } -EAPI void * +ECORE_API void * ecore_event_handler_del(Ecore_Event_Handler *event_handler) { return ecore_event_message_handler_del(_event_msg_handler, event_handler); } -EAPI void * +ECORE_API void * ecore_event_handler_data_get(Ecore_Event_Handler *eh) { return ecore_event_message_handler_data_get(_event_msg_handler, eh); } -EAPI void * +ECORE_API void * ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data) { @@ -48,7 +48,7 @@ ecore_event_handler_data_set(Ecore_Event_Handler *eh, (void *)data); } -EAPI Ecore_Event * +ECORE_API Ecore_Event * ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, @@ -66,7 +66,7 @@ ecore_event_add(int type, return (Ecore_Event *)msg; } -EAPI void * +ECORE_API void * ecore_event_del(Ecore_Event *event) { void *data = NULL; @@ -76,13 +76,13 @@ ecore_event_del(Ecore_Event *event) return data; } -EAPI int +ECORE_API int ecore_event_type_new(void) { return ecore_event_message_handler_type_new(_event_msg_handler); } -EAPI Ecore_Event_Filter * +ECORE_API Ecore_Event_Filter * ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, @@ -93,19 +93,19 @@ ecore_event_filter_add(Ecore_Data_Cb func_start, func_end, (void *)data); } -EAPI void * +ECORE_API void * ecore_event_filter_del(Ecore_Event_Filter *ef) { return ecore_event_message_handler_filter_del(_event_msg_handler, ef); } -EAPI int +ECORE_API int ecore_event_current_type_get(void) { return ecore_event_message_handler_current_type_get(_event_msg_handler); } -EAPI void * +ECORE_API void * ecore_event_current_event_get(void) { return ecore_event_message_handler_current_event_get(_event_msg_handler); @@ -192,7 +192,7 @@ _ecore_event_signal_realtime_new(void) return calloc(1, sizeof(Ecore_Event_Signal_Realtime)); } -EAPI void +ECORE_API void ecore_event_type_flush_internal(int type, ...) { va_list args; diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c index 9bd1dece31..f0b974fb06 100644 --- a/src/lib/ecore/ecore_exe.c +++ b/src/lib/ecore/ecore_exe.c @@ -33,26 +33,26 @@ struct _ecore_exe_dead_exe char *cmd; }; -EAPI int ECORE_EXE_EVENT_ADD = 0; -EAPI int ECORE_EXE_EVENT_DEL = 0; -EAPI int ECORE_EXE_EVENT_DATA = 0; -EAPI int ECORE_EXE_EVENT_ERROR = 0; +ECORE_API int ECORE_EXE_EVENT_ADD = 0; +ECORE_API int ECORE_EXE_EVENT_DEL = 0; +ECORE_API int ECORE_EXE_EVENT_DATA = 0; +ECORE_API int ECORE_EXE_EVENT_ERROR = 0; -EAPI void +ECORE_API void ecore_exe_run_priority_set(int pri) { EINA_MAIN_LOOP_CHECK_RETURN; _impl_ecore_exe_run_priority_set(pri); } -EAPI int +ECORE_API int ecore_exe_run_priority_get(void) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); return _impl_ecore_exe_run_priority_get(); } -EAPI Ecore_Exe * +ECORE_API Ecore_Exe * ecore_exe_run(const char *exe_cmd, const void *data) { @@ -60,7 +60,7 @@ ecore_exe_run(const char *exe_cmd, return ecore_exe_pipe_run(exe_cmd, 0, data); } -EAPI Ecore_Exe * +ECORE_API Ecore_Exe * ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data) @@ -101,7 +101,7 @@ _ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe) return _impl_ecore_exe_efl_object_finalize(obj, exe); } -EAPI void +ECORE_API void ecore_exe_callback_pre_free_set(Ecore_Exe *obj, Ecore_Exe_Cb func) { @@ -111,7 +111,7 @@ ecore_exe_callback_pre_free_set(Ecore_Exe *obj, exe->pre_free_cb = func; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_exe_send(Ecore_Exe *obj, const void *data, int size) @@ -130,7 +130,7 @@ ecore_exe_send(Ecore_Exe *obj, return _impl_ecore_exe_send(obj, exe, data, size); } -EAPI void +ECORE_API void ecore_exe_close_stdin(Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -139,7 +139,7 @@ ecore_exe_close_stdin(Ecore_Exe *obj) exe->close_stdin = 1; } -EAPI void +ECORE_API void ecore_exe_auto_limits_set(Ecore_Exe *obj, int start_bytes, int end_bytes, @@ -153,7 +153,7 @@ ecore_exe_auto_limits_set(Ecore_Exe *obj, start_lines, end_lines); } -EAPI Ecore_Exe_Event_Data * +ECORE_API Ecore_Exe_Event_Data * ecore_exe_event_data_get(Ecore_Exe *obj, Ecore_Exe_Flags flags) { @@ -163,7 +163,7 @@ ecore_exe_event_data_get(Ecore_Exe *obj, return _impl_ecore_exe_event_data_get(obj, exe, flags); } -EAPI void +ECORE_API void ecore_exe_tag_set(Ecore_Exe *obj, const char *tag) { @@ -175,7 +175,7 @@ ecore_exe_tag_set(Ecore_Exe *obj, else exe->tag = NULL; } -EAPI const char * +ECORE_API const char * ecore_exe_tag_get(const Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); @@ -184,7 +184,7 @@ ecore_exe_tag_get(const Ecore_Exe *obj) return exe->tag; } -EAPI void * +ECORE_API void * ecore_exe_free(Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); @@ -202,7 +202,7 @@ _ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe) _impl_ecore_exe_efl_object_destructor(obj, exe); } -EAPI void +ECORE_API void ecore_exe_event_data_free(Ecore_Exe_Event_Data *e) { if (!e) return; @@ -211,7 +211,7 @@ ecore_exe_event_data_free(Ecore_Exe_Event_Data *e) free(e); } -EAPI pid_t +ECORE_API pid_t ecore_exe_pid_get(const Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); @@ -220,7 +220,7 @@ ecore_exe_pid_get(const Ecore_Exe *obj) return exe->pid; } -EAPI const char * +ECORE_API const char * ecore_exe_cmd_get(const Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); @@ -229,7 +229,7 @@ ecore_exe_cmd_get(const Ecore_Exe *obj) return ret; } -EAPI void * +ECORE_API void * ecore_exe_data_get(const Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); @@ -238,7 +238,7 @@ ecore_exe_data_get(const Ecore_Exe *obj) return exe->data; } -EAPI void * +ECORE_API void * ecore_exe_data_set(Ecore_Exe *obj, void *data) { @@ -251,7 +251,7 @@ ecore_exe_data_set(Ecore_Exe *obj, return ret; } -EAPI Ecore_Exe_Flags +ECORE_API Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); @@ -260,13 +260,13 @@ ecore_exe_flags_get(const Ecore_Exe *obj) return exe->flags; } -EAPI void +ECORE_API void ecore_exe_pause(Ecore_Exe *obj) { efl_control_suspend_set(obj, EINA_TRUE); } -EAPI void +ECORE_API void ecore_exe_continue(Ecore_Exe *obj) { efl_control_suspend_set(obj, EINA_FALSE); @@ -280,7 +280,7 @@ _ecore_exe_efl_control_suspend_set(Eo *obj EINA_UNUSED, Ecore_Exe_Data *exe, Ein else _impl_ecore_exe_continue(obj, exe); } -EAPI void +ECORE_API void ecore_exe_interrupt(Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -289,7 +289,7 @@ ecore_exe_interrupt(Ecore_Exe *obj) _impl_ecore_exe_interrupt(obj, exe); } -EAPI void +ECORE_API void ecore_exe_quit(Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -298,7 +298,7 @@ ecore_exe_quit(Ecore_Exe *obj) _impl_ecore_exe_quit(obj, exe); } -EAPI void +ECORE_API void ecore_exe_terminate(Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -307,7 +307,7 @@ ecore_exe_terminate(Ecore_Exe *obj) _impl_ecore_exe_terminate(obj, exe); } -EAPI void +ECORE_API void ecore_exe_kill(Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -316,7 +316,7 @@ ecore_exe_kill(Ecore_Exe *obj) _impl_ecore_exe_kill(obj, exe); } -EAPI void +ECORE_API void ecore_exe_signal(Ecore_Exe *obj, int num) { @@ -326,7 +326,7 @@ ecore_exe_signal(Ecore_Exe *obj, _impl_ecore_exe_signal(obj, exe, num); } -EAPI void +ECORE_API void ecore_exe_hup(Ecore_Exe *obj) { EINA_MAIN_LOOP_CHECK_RETURN; diff --git a/src/lib/ecore/ecore_exe_eo.c b/src/lib/ecore/ecore_exe_eo.c index 6a1775a678..35c5cda92e 100644 --- a/src/lib/ecore/ecore_exe_eo.c +++ b/src/lib/ecore/ecore_exe_eo.c @@ -1,15 +1,15 @@ -EWAPI const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET = +ECORE_API ECORE_API_WEAK const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET = EFL_EVENT_DESCRIPTION("data,get"); -EWAPI const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR = +ECORE_API ECORE_API_WEAK const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR = EFL_EVENT_DESCRIPTION("data,error"); void _ecore_exe_command_set(Eo *obj, Ecore_Exe_Data *pd, const char *exe_cmd, Ecore_Exe_Flags flags); -EOAPI EFL_VOID_FUNC_BODYV(ecore_obj_exe_command_set, EFL_FUNC_CALL(exe_cmd, flags), const char *exe_cmd, Ecore_Exe_Flags flags); +ECORE_API ECORE_API_WEAK EFL_VOID_FUNC_BODYV(ecore_obj_exe_command_set, EFL_FUNC_CALL(exe_cmd, flags), const char *exe_cmd, Ecore_Exe_Flags flags); void _ecore_exe_command_get(const Eo *obj, Ecore_Exe_Data *pd, const char **exe_cmd, Ecore_Exe_Flags *flags); -EOAPI EFL_VOID_FUNC_BODYV_CONST(ecore_obj_exe_command_get, EFL_FUNC_CALL(exe_cmd, flags), const char **exe_cmd, Ecore_Exe_Flags *flags); +ECORE_API ECORE_API_WEAK EFL_VOID_FUNC_BODYV_CONST(ecore_obj_exe_command_get, EFL_FUNC_CALL(exe_cmd, flags), const char **exe_cmd, Ecore_Exe_Flags *flags); void _ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *pd); diff --git a/src/lib/ecore/ecore_exe_eo.h b/src/lib/ecore/ecore_exe_eo.h index a4ab65e635..68392c51f8 100644 --- a/src/lib/ecore/ecore_exe_eo.h +++ b/src/lib/ecore/ecore_exe_eo.h @@ -80,7 +80,7 @@ typedef enum */ #define ECORE_EXE_CLASS ecore_exe_class_get() -EWAPI const Efl_Class *ecore_exe_class_get(void) EINA_CONST; +ECORE_API ECORE_API_WEAK const Efl_Class *ecore_exe_class_get(void) EINA_CONST; /** * @brief Controls the command that's executed. FIXME: May need a split/rename. @@ -91,7 +91,7 @@ EWAPI const Efl_Class *ecore_exe_class_get(void) EINA_CONST; * * @ingroup Ecore_Exe */ -EOAPI void ecore_obj_exe_command_set(Eo *obj, const char *exe_cmd, Ecore_Exe_Flags flags); +ECORE_API ECORE_API_WEAK void ecore_obj_exe_command_set(Eo *obj, const char *exe_cmd, Ecore_Exe_Flags flags); /** * @brief Controls the command that's executed. FIXME: May need a split/rename. @@ -102,9 +102,9 @@ EOAPI void ecore_obj_exe_command_set(Eo *obj, const char *exe_cmd, Ecore_Exe_Fla * * @ingroup Ecore_Exe */ -EOAPI void ecore_obj_exe_command_get(const Eo *obj, const char **exe_cmd, Ecore_Exe_Flags *flags); +ECORE_API ECORE_API_WEAK void ecore_obj_exe_command_get(const Eo *obj, const char **exe_cmd, Ecore_Exe_Flags *flags); -EWAPI extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET; +ECORE_API ECORE_API_WEAK extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET; /** Data received event from the child process * @return Ecore_Exe_Event_Data @@ -113,7 +113,7 @@ EWAPI extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET; */ #define ECORE_EXE_EVENT_DATA_GET (&(_ECORE_EXE_EVENT_DATA_GET)) -EWAPI extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR; +ECORE_API ECORE_API_WEAK extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR; /** Error received event from the child process * @return Ecore_Exe_Event_Data diff --git a/src/lib/ecore/ecore_exe_private.h b/src/lib/ecore/ecore_exe_private.h index aad66fc1da..88710123f5 100644 --- a/src/lib/ecore/ecore_exe_private.h +++ b/src/lib/ecore/ecore_exe_private.h @@ -133,10 +133,10 @@ struct _Ecore_Exe_Data typedef struct _Ecore_Exe_Data Ecore_Exe_Data; -EAPI extern int ECORE_EXE_EVENT_ADD; -EAPI extern int ECORE_EXE_EVENT_DEL; -EAPI extern int ECORE_EXE_EVENT_DATA; -EAPI extern int ECORE_EXE_EVENT_ERROR; +ECORE_API extern int ECORE_EXE_EVENT_ADD; +ECORE_API extern int ECORE_EXE_EVENT_DEL; +ECORE_API extern int ECORE_EXE_EVENT_DATA; +ECORE_API extern int ECORE_EXE_EVENT_ERROR; Ecore_Exe *_ecore_exe_find(pid_t pid); void *_ecore_exe_event_del_new(void); diff --git a/src/lib/ecore/ecore_getopt.c b/src/lib/ecore/ecore_getopt.c index 8dc1981ba8..46d2b180c9 100644 --- a/src/lib/ecore/ecore_getopt.c +++ b/src/lib/ecore/ecore_getopt.c @@ -810,7 +810,7 @@ _ecore_getopt_help_prepare(const Ecore_Getopt *parser) return EINA_TRUE; } -EAPI void +ECORE_API void ecore_getopt_help(FILE *fp, const Ecore_Getopt *parser) { @@ -822,7 +822,7 @@ ecore_getopt_help(FILE *fp, _ecore_getopt_help_options(fp, parser); } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *parser, const char *category) @@ -1977,7 +1977,7 @@ _ecore_getopt_parse_find_long_other(const Ecore_Getopt *parser, return NULL; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser) { const Ecore_Getopt_Desc *desc = parser->descs; @@ -2028,7 +2028,7 @@ _ecore_getopt_find_help(const Ecore_Getopt *parser) return NULL; } -EAPI int +ECORE_API int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, @@ -2092,7 +2092,7 @@ error: return -1; } -EAPI int +ECORE_API int ecore_getopt_parse_positional(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, @@ -2159,7 +2159,7 @@ error: return -1; } -EAPI Eina_List * +ECORE_API Eina_List * ecore_getopt_list_free(Eina_List *list) { void *data; @@ -2169,7 +2169,7 @@ ecore_getopt_list_free(Eina_List *list) return NULL; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser EINA_UNUSED, const Ecore_Getopt_Desc *desc EINA_UNUSED, const char *str, @@ -2187,7 +2187,7 @@ ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser EINA_UNUSED return EINA_TRUE; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser EINA_UNUSED, const Ecore_Getopt_Desc *desc EINA_UNUSED, const char *str, diff --git a/src/lib/ecore/ecore_glib.c b/src/lib/ecore/ecore_glib.c index 8fc2c158bf..a914f1b3ec 100644 --- a/src/lib/ecore/ecore_glib.c +++ b/src/lib/ecore/ecore_glib.c @@ -286,7 +286,7 @@ _ecore_glib_shutdown(void) #endif } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_main_loop_glib_integrate(void) { #ifdef HAVE_GLIB @@ -310,7 +310,7 @@ ecore_main_loop_glib_integrate(void) Eina_Bool _ecore_glib_always_integrate = 1; -EAPI void +ECORE_API void ecore_main_loop_glib_always_integrate_disable(void) { _ecore_glib_always_integrate = 0; diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c index 9ce4716c45..d0268468ae 100644 --- a/src/lib/ecore/ecore_idle_enterer.c +++ b/src/lib/ecore/ecore_idle_enterer.c @@ -14,14 +14,14 @@ EFL_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks, { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); -EAPI Ecore_Idle_Enterer * +ECORE_API Ecore_Idle_Enterer * ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data) { return _ecore_factorized_idle_add(ecore_idle_enterer_callbacks(), func, data); } -EAPI Ecore_Idle_Enterer * +ECORE_API Ecore_Idle_Enterer * ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data) { @@ -36,7 +36,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func, return ie; } -EAPI void * +ECORE_API void * ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer) { return _ecore_factorized_idle_del(idle_enterer); diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c index 9ca26c8ee6..cb6fc75915 100644 --- a/src/lib/ecore/ecore_idle_exiter.c +++ b/src/lib/ecore/ecore_idle_exiter.c @@ -13,14 +13,14 @@ EFL_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks, { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process }, { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); -EAPI Ecore_Idle_Exiter * +ECORE_API Ecore_Idle_Exiter * ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data) { return _ecore_factorized_idle_add(ecore_idle_exiter_callbacks(), func, data); } -EAPI void * +ECORE_API void * ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter) { return _ecore_factorized_idle_del(idle_exiter); diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c index ffd4579cae..cf49586361 100644 --- a/src/lib/ecore/ecore_idler.c +++ b/src/lib/ecore/ecore_idler.c @@ -105,14 +105,14 @@ EFL_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks, { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process }, { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); -EAPI Ecore_Idler * +ECORE_API Ecore_Idler * ecore_idler_add(Ecore_Task_Cb func, const void *data) { return _ecore_factorized_idle_add(ecore_idler_callbacks(), func, data); } -EAPI void * +ECORE_API void * ecore_idler_del(Ecore_Idler *idler) { return _ecore_factorized_idle_del(idler); diff --git a/src/lib/ecore/ecore_internal.h b/src/lib/ecore/ecore_internal.h index 9f6e55eb24..731456bf5e 100644 --- a/src/lib/ecore/ecore_internal.h +++ b/src/lib/ecore/ecore_internal.h @@ -2,34 +2,10 @@ #ifndef _ECORE_INTERNAL_H #define _ECORE_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 <ecore_api.h> -EAPI void ecore_loop_arguments_send(int argc, const char **argv); -EAPI Eina_Bool efl_loop_message_process(Eo *obj); +ECORE_API void ecore_loop_arguments_send(int argc, const char **argv); +ECORE_API Eina_Bool efl_loop_message_process(Eo *obj); static inline Eina_Value efl_model_list_value_get(Eina_List *childrens, @@ -162,7 +138,4 @@ _efl_future_all_repack(Eo *o EINA_UNUSED, void *data EINA_UNUSED, const Eina_Val return eina_value_error_init(EFL_MODEL_ERROR_UNKNOWN); } -#undef EAPI -#define EAPI - #endif diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c index 29d5412a94..ae5ab5dd26 100644 --- a/src/lib/ecore/ecore_job.c +++ b/src/lib/ecore/ecore_job.c @@ -39,7 +39,7 @@ _ecore_job_shutdown(void) _ecore_job_handler = NULL; } -EAPI Ecore_Job * +ECORE_API Ecore_Job * ecore_job_add(Ecore_Cb func, const void *data) { @@ -69,7 +69,7 @@ ecore_job_add(Ecore_Cb func, return job; } -EAPI void * +ECORE_API void * ecore_job_del(Ecore_Job *job) { void *data; diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index efd5310029..450e417eca 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -209,7 +209,7 @@ static gboolean ecore_fds_ready; static double _ecore_main_loop_wakeup_time = 0.0; -EAPI double _ecore_main_loop_wakeup_time_get(void) +ECORE_API double _ecore_main_loop_wakeup_time_get(void) { return _ecore_main_loop_wakeup_time; } @@ -1280,21 +1280,21 @@ _ecore_main_loop_quit(Eo *obj, Efl_Loop_Data *pd) #endif } -EAPI void +ECORE_API void ecore_main_loop_iterate(void) { EINA_MAIN_LOOP_CHECK_RETURN; efl_loop_iterate(ML_OBJ); } -EAPI int +ECORE_API int ecore_main_loop_iterate_may_block(int may_block) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); return efl_loop_iterate_may_block(ML_OBJ, may_block); } -EAPI void +ECORE_API void ecore_main_loop_begin(void) { DBG("ecore_main_loop_begin"); @@ -1304,7 +1304,7 @@ ecore_main_loop_begin(void) eina_evlog("-mainloop", NULL, 0.0, NULL); } -EAPI void +ECORE_API void ecore_main_loop_quit(void) { Eina_Value v = EINA_VALUE_EMPTY; @@ -1315,27 +1315,27 @@ ecore_main_loop_quit(void) efl_loop_quit(ML_OBJ, v); } -EAPI int +ECORE_API int ecore_main_loop_nested_get(void) { return in_main_loop; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_main_loop_animator_ticked_get(void) { DBG("ecore_main_loop_animator_ticked_get"); return _ecore_animator_run_get(); } -EAPI void +ECORE_API void ecore_main_loop_select_func_set(Ecore_Select_Function func) { EINA_MAIN_LOOP_CHECK_RETURN; main_loop_select = func; } -EAPI Ecore_Select_Function +ECORE_API Ecore_Select_Function ecore_main_loop_select_func_get(void) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); @@ -1432,7 +1432,7 @@ _ecore_main_fd_handler_del(Eo *obj EINA_UNUSED, return r; } -EAPI Ecore_Fd_Handler * +ECORE_API Ecore_Fd_Handler * ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, @@ -1449,7 +1449,7 @@ ecore_main_fd_handler_add(int fd, return fdh; } -EAPI Ecore_Fd_Handler * +ECORE_API Ecore_Fd_Handler * ecore_main_fd_handler_file_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, @@ -1463,7 +1463,7 @@ ecore_main_fd_handler_file_add(int fd, buf_func, buf_data, EINA_TRUE); } -EAPI void * +ECORE_API void * ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler) { if (!fd_handler) return NULL; @@ -1479,7 +1479,7 @@ ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler) } #ifdef _WIN32 -EAPI Ecore_Win32_Handler * +ECORE_API Ecore_Win32_Handler * _ecore_main_win32_handler_add(Eo *obj, Efl_Loop_Data *pd, Eo *handler, @@ -1525,7 +1525,7 @@ _ecore_main_win32_handler_del(Eo *obj EINA_UNUSED, return win32_handler->data; } -EAPI Ecore_Win32_Handler * +ECORE_API Ecore_Win32_Handler * ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data) @@ -1534,7 +1534,7 @@ ecore_main_win32_handler_add(void *h, return _ecore_main_win32_handler_add(ML_OBJ, ML_DAT, NULL, h, func, data); } -EAPI void * +ECORE_API void * ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler) { void *ret = NULL; @@ -1551,7 +1551,7 @@ ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler) return ret; } #else -EAPI Ecore_Win32_Handler * +ECORE_API Ecore_Win32_Handler * _ecore_main_win32_handler_add(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED, Eo *handler EINA_UNUSED, @@ -1570,7 +1570,7 @@ _ecore_main_win32_handler_del(Eo *obj EINA_UNUSED, return NULL; } -EAPI Ecore_Win32_Handler * +ECORE_API Ecore_Win32_Handler * ecore_main_win32_handler_add(void *h EINA_UNUSED, Ecore_Win32_Handle_Cb func EINA_UNUSED, const void *data EINA_UNUSED) @@ -1578,14 +1578,14 @@ ecore_main_win32_handler_add(void *h EINA_UNUSED, return NULL; } -EAPI void * +ECORE_API void * ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler EINA_UNUSED) { return NULL; } #endif -EAPI void +ECORE_API void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data) @@ -1610,7 +1610,7 @@ ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, (pd->fd_handlers_with_prep, fd_handler); } -EAPI int +ECORE_API int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler) { if (!fd_handler) return -1; @@ -1626,7 +1626,7 @@ ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler) return fd_handler->fd; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags) { @@ -1646,7 +1646,7 @@ ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, return ret; } -EAPI void +ECORE_API void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags) { diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c index e884494605..73c7e661c3 100644 --- a/src/lib/ecore/ecore_pipe.c +++ b/src/lib/ecore/ecore_pipe.c @@ -89,14 +89,14 @@ GENERIC_ALLOC_SIZE_DECLARE(Ecore_Pipe); static Eina_Bool _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler); -EAPI Ecore_Pipe * +ECORE_API Ecore_Pipe * ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data) { return _ecore_pipe_add(handler, data); } -EAPI void * +ECORE_API void * ecore_pipe_del(Ecore_Pipe *p) { if (!p) return NULL; @@ -104,7 +104,7 @@ ecore_pipe_del(Ecore_Pipe *p) return _ecore_pipe_del(p); } -EAPI void +ECORE_API void ecore_pipe_read_close(Ecore_Pipe *p) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -125,7 +125,7 @@ ecore_pipe_read_close(Ecore_Pipe *p) } } -EAPI int +ECORE_API int ecore_pipe_read_fd(Ecore_Pipe *p) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID); @@ -133,7 +133,7 @@ ecore_pipe_read_fd(Ecore_Pipe *p) return p->fd_read; } -EAPI void +ECORE_API void ecore_pipe_freeze(Ecore_Pipe *p) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -149,7 +149,7 @@ ecore_pipe_freeze(Ecore_Pipe *p) } } -EAPI void +ECORE_API void ecore_pipe_thaw(Ecore_Pipe *p) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -164,7 +164,7 @@ ecore_pipe_thaw(Ecore_Pipe *p) NULL, NULL); } -EAPI int +ECORE_API int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait) @@ -172,7 +172,7 @@ ecore_pipe_wait(Ecore_Pipe *p, return _ecore_pipe_wait(p, message_count, wait); } -EAPI void +ECORE_API void ecore_pipe_write_close(Ecore_Pipe *p) { if (!ECORE_MAGIC_CHECK(p, ECORE_MAGIC_PIPE)) @@ -187,7 +187,7 @@ ecore_pipe_write_close(Ecore_Pipe *p) } } -EAPI int +ECORE_API int ecore_pipe_write_fd(Ecore_Pipe *p) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID); @@ -195,7 +195,7 @@ ecore_pipe_write_fd(Ecore_Pipe *p) return p->fd_write; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes) @@ -289,7 +289,7 @@ out: return ok; } -EAPI Ecore_Pipe * +ECORE_API Ecore_Pipe * ecore_pipe_full_add(Ecore_Pipe_Cb handler, const void *data, int fd_read, diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c index dfc9aa90b0..30554431cc 100644 --- a/src/lib/ecore/ecore_poller.c +++ b/src/lib/ecore/ecore_poller.c @@ -211,7 +211,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED) return ECORE_CALLBACK_RENEW; } -EAPI void +ECORE_API void ecore_poller_poll_interval_set(Ecore_Poller_Type type EINA_UNUSED, double poll_time) { @@ -227,14 +227,14 @@ ecore_poller_poll_interval_set(Ecore_Poller_Type type EINA_UNUSED, _ecore_poller_next_tick_eval(); } -EAPI double +ECORE_API double ecore_poller_poll_interval_get(Ecore_Poller_Type type EINA_UNUSED) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0); return poll_interval; } -EAPI Ecore_Poller * +ECORE_API Ecore_Poller * ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED, int interval, Ecore_Task_Cb func, @@ -278,7 +278,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED, return poller; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval) { int ibit; @@ -310,7 +310,7 @@ ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval) return EINA_TRUE; } -EAPI int +ECORE_API int ecore_poller_poller_interval_get(const Ecore_Poller *poller) { int ibit, interval = 1; @@ -328,7 +328,7 @@ ecore_poller_poller_interval_get(const Ecore_Poller *poller) return interval; } -EAPI void * +ECORE_API void * ecore_poller_del(Ecore_Poller *poller) { void *data; diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h index f87e5e753f..5576bb99e7 100644 --- a/src/lib/ecore/ecore_private.h +++ b/src/lib/ecore/ecore_private.h @@ -2,6 +2,7 @@ #define _ECORE_PRIVATE_H #include <assert.h> +#include <ecore_api.h> #include "ecore_internal.h" @@ -9,32 +10,6 @@ #include "ecore_event_message.eo.h" #include "ecore_event_message_handler.eo.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 - extern int _ecore_log_dom; #ifdef _ECORE_DEFAULT_LOG_DOM # undef _ECORE_DEFAULT_LOG_DOM @@ -222,7 +197,7 @@ typedef struct _Ecore_Evas_Object_Animator_Interface void *(*del)(Ecore_Animator *animator); } Ecore_Evas_Object_Animator_Interface; -EAPI void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interface *iface); +ECORE_API void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interface *iface); #define EVAS_FRAME_QUEUING 1 /* for test */ @@ -247,6 +222,12 @@ EAPI void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interface * typedef unsigned int Ecore_Magic; #define ECORE_MAGIC Ecore_Magic __magic +ECORE_API void +_ecore_magic_fail(const void *d, + Ecore_Magic m, + Ecore_Magic req_m, + const char *fname EINA_UNUSED); + #define ECORE_MAGIC_SET(d, m) (d)->__magic = (m) #define ECORE_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m))) #define ECORE_MAGIC_FAIL(d, m, fn) _ecore_magic_fail((d), (d) ? (d)->__magic : 0, (m), (fn)); @@ -261,7 +242,7 @@ typedef unsigned int Ecore_Magic; #undef IF_FN_DEL #define IF_FN_DEL(_fn, ptr) if (ptr) { _fn(ptr); ptr = NULL; } -EAPI void +ECORE_API void ecore_print_warning(const char *function, const char *sparam); @@ -282,7 +263,7 @@ ecore_print_warning(const char *function, return; \ } -EAPI void _ecore_magic_fail(const void *d, +ECORE_API void _ecore_magic_fail(const void *d, Ecore_Magic m, Ecore_Magic req_m, const char *fname); @@ -557,7 +538,4 @@ extern Efl_Version _app_efl_version; #define EFL_LOOP_DATA efl_data_scope_get(efl_main_loop_get(), EFL_LOOP_CLASS) -#undef EAPI -#define EAPI - #endif diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c index f38c7880c1..d253a9ab5d 100644 --- a/src/lib/ecore/ecore_thread.c +++ b/src/lib/ecore/ecore_thread.c @@ -654,7 +654,7 @@ _ecore_thread_shutdown(void) CDD(_ecore_thread_global_hash_cond); } -EAPI Ecore_Thread * +ECORE_API Ecore_Thread * ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, @@ -737,7 +737,7 @@ retry: return (Ecore_Thread *)work; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_cancel(Ecore_Thread *thread) { Ecore_Pthread_Worker *volatile work = (Ecore_Pthread_Worker *)thread; @@ -846,7 +846,7 @@ _ecore_thread_wait_end(void *data EINA_UNUSED, Ecore_Thread *thread) _ecore_thread_wait_reset(waiter, worker); } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_wait(Ecore_Thread *thread, double wait) { Ecore_Pthread_Worker *worker = (Ecore_Pthread_Worker *)thread; @@ -888,7 +888,7 @@ ecore_thread_wait(Ecore_Thread *thread, double wait) } } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_check(Ecore_Thread *thread) { Ecore_Pthread_Worker *volatile worker = (Ecore_Pthread_Worker *)thread; @@ -907,7 +907,7 @@ ecore_thread_check(Ecore_Thread *thread) return cancel; } -EAPI Ecore_Thread * +ECORE_API Ecore_Thread * ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify, Ecore_Thread_Cb func_end, @@ -1033,7 +1033,7 @@ on_error: return (Ecore_Thread *)worker; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *data) { @@ -1086,7 +1086,7 @@ ecore_thread_feedback(Ecore_Thread *thread, } #if 0 -EAPI Ecore_Thread * +ECORE_API Ecore_Thread * ecore_thread_message_run(Ecore_Thread_Cb func_main, Ecore_Thread_Notify_Cb func_notify, Ecore_Thread_Cb func_end, @@ -1145,7 +1145,7 @@ ecore_thread_message_run(Ecore_Thread_Cb func_main, #endif -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread) { Ecore_Pthread_Worker *worker = (Ecore_Pthread_Worker *)thread; @@ -1158,14 +1158,14 @@ ecore_thread_reschedule(Ecore_Thread *thread) return EINA_TRUE; } -EAPI int +ECORE_API int ecore_thread_active_get(void) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); return _ecore_thread_count; } -EAPI int +ECORE_API int ecore_thread_pending_get(void) { int ret; @@ -1177,7 +1177,7 @@ ecore_thread_pending_get(void) return ret; } -EAPI int +ECORE_API int ecore_thread_pending_feedback_get(void) { int ret; @@ -1189,7 +1189,7 @@ ecore_thread_pending_feedback_get(void) return ret; } -EAPI int +ECORE_API int ecore_thread_pending_total_get(void) { int ret; @@ -1201,14 +1201,14 @@ ecore_thread_pending_total_get(void) return ret; } -EAPI int +ECORE_API int ecore_thread_max_get(void) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); return _ecore_thread_count_max; } -EAPI void +ECORE_API void ecore_thread_max_set(int num) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -1219,14 +1219,14 @@ ecore_thread_max_set(int num) _ecore_thread_count_max = num; } -EAPI void +ECORE_API void ecore_thread_max_reset(void) { EINA_MAIN_LOOP_CHECK_RETURN; _ecore_thread_count_max = eina_cpu_count() * 4; } -EAPI int +ECORE_API int ecore_thread_available_get(void) { int ret; @@ -1237,7 +1237,7 @@ ecore_thread_available_get(void) return ret; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value, @@ -1275,7 +1275,7 @@ ecore_thread_local_data_add(Ecore_Thread *thread, return ret; } -EAPI void * +ECORE_API void * ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, @@ -1316,7 +1316,7 @@ ecore_thread_local_data_set(Ecore_Thread *thread, return NULL; } -EAPI void * +ECORE_API void * ecore_thread_local_data_find(Ecore_Thread *thread, const char *key) { @@ -1337,7 +1337,7 @@ ecore_thread_local_data_find(Ecore_Thread *thread, return NULL; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key) { @@ -1356,7 +1356,7 @@ ecore_thread_local_data_del(Ecore_Thread *thread, return r; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, @@ -1395,7 +1395,7 @@ ecore_thread_global_data_add(const char *key, return ret; } -EAPI void * +ECORE_API void * ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb) @@ -1434,7 +1434,7 @@ ecore_thread_global_data_set(const char *key, return NULL; } -EAPI void * +ECORE_API void * ecore_thread_global_data_find(const char *key) { Ecore_Thread_Data *ret; @@ -1452,7 +1452,7 @@ ecore_thread_global_data_find(const char *key) return NULL; } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_thread_global_data_del(const char *key) { Eina_Bool ret; @@ -1469,7 +1469,7 @@ ecore_thread_global_data_del(const char *key) return ret; } -EAPI void * +ECORE_API void * ecore_thread_global_data_wait(const char *key, double seconds) { diff --git a/src/lib/ecore/ecore_throttle.c b/src/lib/ecore/ecore_throttle.c index 2fe816ad62..36bcc4a613 100644 --- a/src/lib/ecore/ecore_throttle.c +++ b/src/lib/ecore/ecore_throttle.c @@ -10,7 +10,7 @@ static int throttle_val = 0; -EAPI void +ECORE_API void ecore_throttle_adjust(double amount) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -19,7 +19,7 @@ ecore_throttle_adjust(double amount) if (throttle_val < 0) throttle_val = 0; } -EAPI double +ECORE_API double ecore_throttle_get(void) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0); diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c index 9f039e2b59..594b00a31e 100644 --- a/src/lib/ecore/ecore_time.c +++ b/src/lib/ecore/ecore_time.c @@ -29,7 +29,7 @@ static Eina_Bool _ecore_time_got_clock_id = EINA_FALSE; static double _ecore_time_clock_conversion = 1e-9; #endif -EAPI double +ECORE_API double ecore_time_get(void) { #ifdef _WIN32 @@ -57,7 +57,7 @@ ecore_time_get(void) #endif } -EAPI double +ECORE_API double ecore_time_unix_get(void) { #ifdef HAVE_GETTIMEOFDAY @@ -70,13 +70,13 @@ ecore_time_unix_get(void) #endif } -EAPI double +ECORE_API double ecore_loop_time_get(void) { return efl_loop_time_get(ML_OBJ); } -EAPI void +ECORE_API void ecore_loop_time_set(double t) { efl_loop_time_set(ML_OBJ, t); diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 5713313a1b..599917b477 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -65,14 +65,14 @@ static void _efl_loop_timer_set(Efl_Loop_Timer_Data *timer, double at, double in static double precision = 10.0 / 1000000.0; -EAPI double +ECORE_API double ecore_timer_precision_get(void) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0); return precision; } -EAPI void +ECORE_API void ecore_timer_precision_set(double value) { EINA_MAIN_LOOP_CHECK_RETURN; @@ -185,7 +185,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(legacy_timer, { EFL_LOOP_TIMER_EVENT_TIMER_TICK, _ecore_timer_legacy_tick }, { EFL_EVENT_DEL, _ecore_timer_legacy_del }); -EAPI Ecore_Timer * +ECORE_API Ecore_Timer * ecore_timer_add(double in, Ecore_Task_Cb func, const void *data) { Ecore_Timer_Legacy *legacy; @@ -209,7 +209,7 @@ ecore_timer_add(double in, Ecore_Task_Cb func, const void *data) return timer; } -EAPI Ecore_Timer * +ECORE_API Ecore_Timer * ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data) { Ecore_Timer_Legacy *legacy; @@ -234,7 +234,7 @@ ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data) return timer; } -EAPI void * +ECORE_API void * ecore_timer_del(Ecore_Timer *timer) { void *data; @@ -330,7 +330,7 @@ _efl_loop_timer_time_pending_get(const Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data return ret; } -EAPI void +ECORE_API void ecore_timer_freeze(Ecore_Timer *timer) { ECORE_TIMER_CHECK(timer); @@ -360,7 +360,7 @@ _efl_loop_timer_efl_object_event_freeze(Eo *obj, Efl_Loop_Timer_Data *timer) _efl_loop_timer_util_instanciate(timer->loop_data, timer); } -EAPI Eina_Bool +ECORE_API Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE); @@ -373,7 +373,7 @@ _efl_loop_timer_efl_object_event_freeze_count_get(const Eo *obj EINA_UNUSED, Efl return timer->frozen; } -EAPI void +ECORE_API void ecore_timer_thaw(Ecore_Timer *timer) { ECORE_TIMER_CHECK(timer); @@ -399,7 +399,7 @@ _efl_loop_timer_efl_object_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer) _efl_loop_timer_set(timer, timer->pending + now, timer->in); } -EAPI char * +ECORE_API char * ecore_timer_dump(void) { return NULL; diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c index 726a4b36a0..c54e6f6533 100644 --- a/src/lib/ecore/efl_loop.c +++ b/src/lib/ecore/efl_loop.c @@ -33,7 +33,7 @@ GENERIC_ALLOC_SIZE_DECLARE(Efl_Loop_Promise_Simple_Data); Eo *_mainloop_singleton = NULL; Efl_Loop_Data *_mainloop_singleton_data = NULL; -EAPI Eo * +ECORE_API Eo * efl_main_loop_get(void) { return efl_app_main_get(); @@ -97,7 +97,7 @@ _efl_loop_time_get(const Eo *obj EINA_UNUSED, Efl_Loop_Data *pd) return pd->loop_time; } -EAPI void +ECORE_API void efl_exit(int exit_code) { Eina_Value v = EINA_VALUE_EMPTY; @@ -107,7 +107,7 @@ efl_exit(int exit_code) efl_loop_quit(efl_main_loop_get(), v); } -EAPI int +ECORE_API int efl_loop_exit_code_process(Eina_Value *value) { Eina_Value def = EINA_VALUE_EMPTY; @@ -359,7 +359,7 @@ _efl_loop_arguments_cleanup(Eo *o EINA_UNUSED, void *data, const Eina_Future *de // It doesn't make sense to send those argument to any other mainloop // As it also doesn't make sense to allow anyone to override this, so // should be internal for sure, not even protected. -EAPI void +ECORE_API void ecore_loop_arguments_send(int argc, const char **argv) { Eina_Array *arga, *cml; @@ -633,9 +633,9 @@ _efl_loop_message_process(Eo *obj, Efl_Loop_Data *pd) return EINA_TRUE; } -EOAPI EFL_FUNC_BODY(efl_loop_message_process, Eina_Bool, 0); +ECORE_API ECORE_API_WEAK EFL_FUNC_BODY(efl_loop_message_process, Eina_Bool, 0); -EWAPI void +ECORE_API ECORE_API_WEAK void efl_build_version_set(int vmaj, int vmin, int vmic, int revision, const char *flavor, const char *build_id) { @@ -667,7 +667,7 @@ EFL_SCHEDULER_ARRAY_DEFINE(loop_scheduler, EFL_LOOP_EVENT_IDLE_ENTER, EFL_LOOP_EVENT_IDLE); -EAPI Eina_Future_Scheduler * +ECORE_API Eina_Future_Scheduler * efl_loop_future_scheduler_get(const Eo *obj) { Efl_Loop *loop; diff --git a/src/lib/ecore/efl_loop_timer_eo.legacy.c b/src/lib/ecore/efl_loop_timer_eo.legacy.c index b3d2765122..94ff94c698 100644 --- a/src/lib/ecore/efl_loop_timer_eo.legacy.c +++ b/src/lib/ecore/efl_loop_timer_eo.legacy.c @@ -1,35 +1,35 @@ -EAPI void +ECORE_API void ecore_timer_interval_set(Efl_Loop_Timer *obj, double in) { efl_loop_timer_interval_set(obj, in); } -EAPI double +ECORE_API double ecore_timer_interval_get(const Efl_Loop_Timer *obj) { return efl_loop_timer_interval_get(obj); } -EAPI double +ECORE_API double ecore_timer_pending_get(const Efl_Loop_Timer *obj) { return efl_loop_timer_time_pending_get(obj); } -EAPI void +ECORE_API void ecore_timer_reset(Efl_Loop_Timer *obj) { efl_loop_timer_reset(obj); } -EAPI void +ECORE_API void ecore_timer_loop_reset(Efl_Loop_Timer *obj) { efl_loop_timer_loop_reset(obj); } -EAPI void +ECORE_API void ecore_timer_delay(Efl_Loop_Timer *obj, double add) { efl_loop_timer_delay(obj, add); diff --git a/src/lib/ecore/efl_loop_timer_eo.legacy.h b/src/lib/ecore/efl_loop_timer_eo.legacy.h index 43c372a5d7..67b2c0bb48 100644 --- a/src/lib/ecore/efl_loop_timer_eo.legacy.h +++ b/src/lib/ecore/efl_loop_timer_eo.legacy.h @@ -24,7 +24,7 @@ typedef Eo Efl_Loop_Timer; * * @ingroup Ecore_Timer_Group */ -EAPI void ecore_timer_interval_set(Efl_Loop_Timer *obj, double in); +ECORE_API void ecore_timer_interval_set(Efl_Loop_Timer *obj, double in); /** * @brief Interval the timer ticks on. @@ -35,7 +35,7 @@ EAPI void ecore_timer_interval_set(Efl_Loop_Timer *obj, double in); * * @ingroup Ecore_Timer_Group */ -EAPI double ecore_timer_interval_get(const Efl_Loop_Timer *obj); +ECORE_API double ecore_timer_interval_get(const Efl_Loop_Timer *obj); /** * @brief Pending time regarding a timer. @@ -46,7 +46,7 @@ EAPI double ecore_timer_interval_get(const Efl_Loop_Timer *obj); * * @ingroup Ecore_Timer_Group */ -EAPI double ecore_timer_pending_get(const Efl_Loop_Timer *obj); +ECORE_API double ecore_timer_pending_get(const Efl_Loop_Timer *obj); /** * @brief Resets a timer to its full interval. This effectively makes the timer @@ -61,7 +61,7 @@ EAPI double ecore_timer_pending_get(const Efl_Loop_Timer *obj); * * @ingroup Ecore_Timer_Group */ -EAPI void ecore_timer_reset(Efl_Loop_Timer *obj); +ECORE_API void ecore_timer_reset(Efl_Loop_Timer *obj); /** This effectively resets a timer but based on the time when this iteration * of the main loop started. @@ -70,7 +70,7 @@ EAPI void ecore_timer_reset(Efl_Loop_Timer *obj); * * @ingroup Ecore_Timer_Group */ -EAPI void ecore_timer_loop_reset(Efl_Loop_Timer *obj); +ECORE_API void ecore_timer_loop_reset(Efl_Loop_Timer *obj); /** * @brief Adds a delay to the next occurrence of a timer. This doesn't affect @@ -81,6 +81,6 @@ EAPI void ecore_timer_loop_reset(Efl_Loop_Timer *obj); * * @ingroup Ecore_Timer_Group */ -EAPI void ecore_timer_delay(Efl_Loop_Timer *obj, double add); +ECORE_API void ecore_timer_delay(Efl_Loop_Timer *obj, double add); #endif diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build index dfc2dece55..58b3b125a5 100644 --- a/src/lib/ecore/meson.build +++ b/src/lib/ecore/meson.build @@ -23,6 +23,7 @@ foreach eo_file : pub_legacy_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', 'ECORE_API', '-gchd', '@INPUT@']) endforeach @@ -83,6 +84,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', 'ECORE_API', '-gchd', '@INPUT@']) endforeach @@ -99,6 +101,7 @@ ecore_header_src = [ 'efl_general.h', 'Ecore_Getopt.h', 'ecore_exe_eo.h', + 'ecore_api.h', 'ecore_exe_eo.legacy.h', 'efl_loop_timer_eo.legacy.h', ] @@ -202,7 +205,7 @@ ecore_lib = library('ecore', dependencies: ecore_pub_deps + [ecore_deps, ecore_ext_deps], include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, - c_args : package_c_args, + c_args : [package_c_args, '-DECORE_BUILD'], version : meson.project_version() ) diff --git a/src/tests/ecore/ecore_suite.h b/src/tests/ecore/ecore_suite.h index 2621535f59..1dbf9830b0 100644 --- a/src/tests/ecore/ecore_suite.h +++ b/src/tests/ecore/ecore_suite.h @@ -25,4 +25,7 @@ void ecore_test_ecore_args(TCase *tc); void ecore_test_ecore_pipe(TCase *tc); void ecore_test_ecore_evas_selection(TCase *tc); +#define ECORETEST_API +#define ECORETEST_API_WEAK + #endif /* _ECORE_SUITE_H */ diff --git a/src/tests/ecore/efl_app_test_cml.c b/src/tests/ecore/efl_app_test_cml.c index 33024dabb8..e03ebfa5ee 100644 --- a/src/tests/ecore/efl_app_test_cml.c +++ b/src/tests/ecore/efl_app_test_cml.c @@ -15,6 +15,9 @@ typedef struct { } Efl_App_Test_CML_Data; +#define ECORETEST_API +#define ECORETEST_API_WEAK + #include "efl_app_test_cml.eo.h" #include "efl_app_test_cml.eo.c" diff --git a/src/tests/ecore/meson.build b/src/tests/ecore/meson.build index 48c9350638..4edb97ddca 100644 --- a/src/tests/ecore/meson.build +++ b/src/tests/ecore/meson.build @@ -39,6 +39,7 @@ foreach eo_file : test_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', 'ECORETEST_API', '-gchd', '@INPUT@']) endforeach @@ -95,6 +96,7 @@ foreach eo_file : priv_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', 'ECORETEST_API', '-gchd', '@INPUT@']) endforeach |