summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-05-26 15:44:41 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-05-26 15:46:25 +0100
commit39b48ca430d635a5c7d9c3e1074003b252f8e86b (patch)
treea2dbea9eb07cecb874a171a63db385615d86baa5 /src/lib/ecore
parent26ea0eaac2a55da5417795babc29d2927005e9fc (diff)
Revert "fix warnings about redefinting EWAPI etc. due to windows EAPI changes"
This reverts commit e2d6691d524e15b0b0673d121e81c0544271617b. This reverts commit c02b796fdb0960411b24576f654a03f0e765a842. This reverts commit 6c969f6b7d59e64e8bdf09a5e535de9561d77535. This reverts commit 74204bccd724fe9dee428056d4710f37bbc2cffb. This reverts commit 1304d9571775ef740ac6b8978ea4a2025a52c99a. This reverts commit 7c85be9674eaa0362b88f01c61107aa6e7c383a2. revert the EAPI changes that break cxx bindings build. sorry :( more fixes needed than i thought
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/Ecore.h32
-rw-r--r--src/lib/ecore/Ecore_Common.h274
-rw-r--r--src/lib/ecore/Ecore_Eo.h12
-rw-r--r--src/lib/ecore/Ecore_Getopt.h46
-rw-r--r--src/lib/ecore/Ecore_Legacy.h56
-rw-r--r--src/lib/ecore/Efl_Core.h30
-rw-r--r--src/lib/ecore/ecore.c42
-rw-r--r--src/lib/ecore/ecore_anim.c28
-rw-r--r--src/lib/ecore/ecore_api.h32
-rw-r--r--src/lib/ecore/ecore_app.c6
-rw-r--r--src/lib/ecore/ecore_events.c26
-rw-r--r--src/lib/ecore/ecore_exe.c60
-rw-r--r--src/lib/ecore/ecore_exe_eo.c8
-rw-r--r--src/lib/ecore/ecore_exe_eo.h10
-rw-r--r--src/lib/ecore/ecore_exe_private.h8
-rw-r--r--src/lib/ecore/ecore_getopt.c16
-rw-r--r--src/lib/ecore/ecore_glib.c4
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c6
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c4
-rw-r--r--src/lib/ecore/ecore_idler.c4
-rw-r--r--src/lib/ecore/ecore_internal.h33
-rw-r--r--src/lib/ecore/ecore_job.c4
-rw-r--r--src/lib/ecore/ecore_main.c44
-rw-r--r--src/lib/ecore/ecore_pipe.c22
-rw-r--r--src/lib/ecore/ecore_poller.c12
-rw-r--r--src/lib/ecore/ecore_private.h42
-rw-r--r--src/lib/ecore/ecore_thread.c50
-rw-r--r--src/lib/ecore/ecore_throttle.c4
-rw-r--r--src/lib/ecore/ecore_time.c8
-rw-r--r--src/lib/ecore/ecore_timer.c18
-rw-r--r--src/lib/ecore/efl_loop.c14
-rw-r--r--src/lib/ecore/efl_loop_timer_eo.legacy.c12
-rw-r--r--src/lib/ecore/efl_loop_timer_eo.legacy.h12
-rw-r--r--src/lib/ecore/meson.build5
34 files changed, 540 insertions, 444 deletions
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index bafb57e400..e87ccc6093 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -276,7 +276,32 @@
276#include <Eina.h> 276#include <Eina.h>
277#include <Eo.h> 277#include <Eo.h>
278#include <Efl.h> 278#include <Efl.h>
279#include <ecore_api.h> 279
280#ifdef EAPI
281# undef EAPI
282#endif
283
284#ifdef _WIN32
285# ifdef EFL_BUILD
286# ifdef DLL_EXPORT
287# define EAPI __declspec(dllexport)
288# else
289# define EAPI
290# endif
291# else
292# define EAPI __declspec(dllimport)
293# endif
294#else
295# ifdef __GNUC__
296# if __GNUC__ >= 4
297# define EAPI __attribute__ ((visibility("default")))
298# else
299# define EAPI
300# endif
301# else
302# define EAPI
303# endif
304#endif
280 305
281#ifdef _WIN32 306#ifdef _WIN32
282# define WIN32_LEAN_AND_MEAN 307# define WIN32_LEAN_AND_MEAN
@@ -306,10 +331,13 @@ extern "C" {
306#endif 331#endif
307#include "Ecore_Eo.h" 332#include "Ecore_Eo.h"
308 333
309ECORE_API double _ecore_main_loop_wakeup_time_get(void); 334EAPI double _ecore_main_loop_wakeup_time_get(void);
310 335
311#ifdef __cplusplus 336#ifdef __cplusplus
312} 337}
313#endif 338#endif
314 339
340#undef EAPI
341#define EAPI
342
315#endif 343#endif
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index aa2e8423db..899debc267 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -47,7 +47,7 @@
47 * This function will call eina_init(), so other environment variables 47 * This function will call eina_init(), so other environment variables
48 * may apply. 48 * may apply.
49 */ 49 */
50ECORE_API int ecore_init(void); 50EAPI int ecore_init(void);
51 51
52/** 52/**
53 * Shuts down connections, signal handlers sockets etc. 53 * Shuts down connections, signal handlers sockets etc.
@@ -60,7 +60,7 @@ ECORE_API int ecore_init(void);
60 * Do not call this function from any callback that may be called from the main 60 * Do not call this function from any callback that may be called from the main
61 * loop, as the main loop will then fall over and not function properly. 61 * loop, as the main loop will then fall over and not function properly.
62 */ 62 */
63ECORE_API int ecore_shutdown(void); 63EAPI int ecore_shutdown(void);
64 64
65/** 65/**
66 * This function will propagate the events on the main loop. So you 66 * This function will propagate the events on the main loop. So you
@@ -70,7 +70,7 @@ ECORE_API int ecore_shutdown(void);
70 * Once you are shuting down your program, you should symmetrically 70 * Once you are shuting down your program, you should symmetrically
71 * call ecore_shutdown_ex(). 71 * call ecore_shutdown_ex().
72 */ 72 */
73ECORE_API unsigned int ecore_init_ex(int argc, char **argv); 73EAPI unsigned int ecore_init_ex(int argc, char **argv);
74 74
75/** 75/**
76 * Shuts down connections, signal handlers sockets etc. 76 * Shuts down connections, signal handlers sockets etc.
@@ -85,7 +85,7 @@ ECORE_API unsigned int ecore_init_ex(int argc, char **argv);
85 * 85 *
86 * Note: This function should be called in symetric to ecore_init_ex() 86 * Note: This function should be called in symetric to ecore_init_ex()
87 */ 87 */
88ECORE_API unsigned int ecore_shutdown_ex(void); 88EAPI unsigned int ecore_shutdown_ex(void);
89 89
90/** 90/**
91 * @brief Inform EFL of the version this application was built for. 91 * @brief Inform EFL of the version this application was built for.
@@ -94,7 +94,7 @@ ECORE_API unsigned int ecore_shutdown_ex(void);
94 * 94 *
95 * @since 1.18 (as beta) 95 * @since 1.18 (as beta)
96 */ 96 */
97ECORE_API ECORE_API_WEAK void efl_build_version_set(int vmaj, int vmin, int vmic, int revision, const char *flavor, const char *build_id); 97EWAPI void efl_build_version_set(int vmaj, int vmin, int vmic, int revision, const char *flavor, const char *build_id);
98 98
99/** 99/**
100 * @} 100 * @}
@@ -147,7 +147,7 @@ typedef struct _Ecore_Version
147 int revision; /** < git revision (0 if a proper release or the git revision number Ecore is built from) */ 147 int revision; /** < git revision (0 if a proper release or the git revision number Ecore is built from) */
148} Ecore_Version; 148} Ecore_Version;
149 149
150ECORE_API extern Ecore_Version *ecore_version; 150EAPI extern Ecore_Version *ecore_version;
151 151
152#define ECORE_CALLBACK_CANCEL EINA_FALSE /**< Return value to remove a callback */ 152#define ECORE_CALLBACK_CANCEL EINA_FALSE /**< Return value to remove a callback */
153#define ECORE_CALLBACK_RENEW EINA_TRUE /**< Return value to keep a callback */ 153#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
180 * 180 *
181 * @see ecore_main_loop_iterate_may_block() 181 * @see ecore_main_loop_iterate_may_block()
182 */ 182 */
183ECORE_API void ecore_main_loop_iterate(void); 183EAPI void ecore_main_loop_iterate(void);
184 184
185/** 185/**
186 * Runs a single iteration of the main loop to process everything on the 186 * Runs a single iteration of the main loop to process everything on the
@@ -200,7 +200,7 @@ ECORE_API void ecore_main_loop_iterate(void);
200 * @return @c 1 if event exists, else @c 0. 200 * @return @c 1 if event exists, else @c 0.
201 * @see ecore_main_loop_iterate() 201 * @see ecore_main_loop_iterate()
202 */ 202 */
203ECORE_API int ecore_main_loop_iterate_may_block(int may_block); 203EAPI int ecore_main_loop_iterate_may_block(int may_block);
204 204
205/** 205/**
206 * Sets the function to use when monitoring multiple file descriptors, 206 * Sets the function to use when monitoring multiple file descriptors,
@@ -215,7 +215,7 @@ ECORE_API int ecore_main_loop_iterate_may_block(int may_block);
215 * 215 *
216 * @param func The function to be used. 216 * @param func The function to be used.
217 */ 217 */
218ECORE_API void ecore_main_loop_select_func_set(Ecore_Select_Function func); 218EAPI void ecore_main_loop_select_func_set(Ecore_Select_Function func);
219 219
220/** 220/**
221 * Gets the select function set by ecore_select_func_set(), 221 * Gets the select function set by ecore_select_func_set(),
@@ -224,7 +224,7 @@ ECORE_API void ecore_main_loop_select_func_set(Ecore_Select_Function func);
224 * @return A function which can be used to replace select() in the main loop. 224 * @return A function which can be used to replace select() in the main loop.
225 * 225 *
226 */ 226 */
227ECORE_API Ecore_Select_Function ecore_main_loop_select_func_get(void); 227EAPI Ecore_Select_Function ecore_main_loop_select_func_get(void);
228 228
229/** 229/**
230 * Requests ecore to integrate GLib's main loop. 230 * Requests ecore to integrate GLib's main loop.
@@ -276,7 +276,7 @@ ECORE_API Ecore_Select_Function ecore_main_loop_select_func_get(void);
276 * --with-glib=always. 276 * --with-glib=always.
277 * 277 *
278 */ 278 */
279ECORE_API Eina_Bool ecore_main_loop_glib_integrate(void); 279EAPI Eina_Bool ecore_main_loop_glib_integrate(void);
280 280
281/** 281/**
282 * Disables always integrating GLib. 282 * Disables always integrating GLib.
@@ -287,7 +287,7 @@ ECORE_API Eina_Bool ecore_main_loop_glib_integrate(void);
287 * This is for apps that explicitly do not want this to happen for whatever 287 * This is for apps that explicitly do not want this to happen for whatever
288 * reasons they may have. 288 * reasons they may have.
289 */ 289 */
290ECORE_API void ecore_main_loop_glib_always_integrate_disable(void); 290EAPI void ecore_main_loop_glib_always_integrate_disable(void);
291 291
292/** 292/**
293 * Runs the application main loop. 293 * Runs the application main loop.
@@ -311,7 +311,7 @@ ECORE_API void ecore_main_loop_glib_always_integrate_disable(void);
311 * timeout for the timers can be changed using 311 * timeout for the timers can be changed using
312 * ecore_main_loop_select_func_set(). 312 * ecore_main_loop_select_func_set().
313 */ 313 */
314ECORE_API void ecore_main_loop_begin(void); 314EAPI void ecore_main_loop_begin(void);
315 315
316/** 316/**
317 * Quits the main loop once all the events currently on the queue have 317 * Quits the main loop once all the events currently on the queue have
@@ -322,7 +322,7 @@ ECORE_API void ecore_main_loop_begin(void);
322 * end of the current main loop iteration. 322 * end of the current main loop iteration.
323 * 323 *
324 */ 324 */
325ECORE_API void ecore_main_loop_quit(void); 325EAPI void ecore_main_loop_quit(void);
326 326
327/** 327/**
328 * Returns if an animator has ticked off during this loop iteration. 328 * Returns if an animator has ticked off during this loop iteration.
@@ -333,7 +333,7 @@ ECORE_API void ecore_main_loop_quit(void);
333 * 333 *
334 * @since 1.9 334 * @since 1.9
335 */ 335 */
336ECORE_API Eina_Bool ecore_main_loop_animator_ticked_get(void); 336EAPI Eina_Bool ecore_main_loop_animator_ticked_get(void);
337 337
338/** 338/**
339 * Returns if the ecore_main_loop is running. 339 * Returns if the ecore_main_loop is running.
@@ -344,7 +344,7 @@ ECORE_API Eina_Bool ecore_main_loop_animator_ticked_get(void);
344 * 344 *
345 * @since 1.13 345 * @since 1.13
346 */ 346 */
347ECORE_API int ecore_main_loop_nested_get(void); 347EAPI int ecore_main_loop_nested_get(void);
348 348
349/** 349/**
350 * @typedef Ecore_Cb Ecore_Cb 350 * @typedef Ecore_Cb Ecore_Cb
@@ -372,7 +372,7 @@ typedef void *(*Ecore_Data_Cb)(void *data);
372 * @return @c EINA_TRUE on success, else @c EINA_FALSE. 372 * @return @c EINA_TRUE on success, else @c EINA_FALSE.
373 * @since 1.7 373 * @since 1.7
374 */ 374 */
375ECORE_API Eina_Bool ecore_fork_reset_callback_add(Ecore_Cb func, const void *data); 375EAPI Eina_Bool ecore_fork_reset_callback_add(Ecore_Cb func, const void *data);
376 376
377/** 377/**
378 * This removes the callback specified. 378 * This removes the callback specified.
@@ -386,7 +386,7 @@ ECORE_API Eina_Bool ecore_fork_reset_callback_add(Ecore_Cb func, const void *dat
386 * @return @c EINA_TRUE on success, else @c EINA_FALSE. 386 * @return @c EINA_TRUE on success, else @c EINA_FALSE.
387 * @since 1.7 387 * @since 1.7
388 */ 388 */
389ECORE_API Eina_Bool ecore_fork_reset_callback_del(Ecore_Cb func, const void *data); 389EAPI Eina_Bool ecore_fork_reset_callback_del(Ecore_Cb func, const void *data);
390 390
391/** 391/**
392 * Resets the ecore internal state after a fork. 392 * Resets the ecore internal state after a fork.
@@ -405,7 +405,7 @@ ECORE_API Eina_Bool ecore_fork_reset_callback_del(Ecore_Cb func, const void *dat
405 * 405 *
406 * @since 1.7 406 * @since 1.7
407 */ 407 */
408ECORE_API void ecore_fork_reset(void); 408EAPI void ecore_fork_reset(void);
409 409
410/** 410/**
411 * @brief Calls callback asynchronously in the main loop. 411 * @brief Calls callback asynchronously in the main loop.
@@ -422,7 +422,7 @@ ECORE_API void ecore_fork_reset(void);
422 * in the thread, it is owned by the main loop and your callback should take 422 * in the thread, it is owned by the main loop and your callback should take
423 * care of freeing it if necessary. 423 * care of freeing it if necessary.
424 */ 424 */
425ECORE_API void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data); 425EAPI void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data);
426 426
427/** 427/**
428 * @brief Calls callback synchronously in the main loop. 428 * @brief Calls callback synchronously in the main loop.
@@ -439,7 +439,7 @@ ECORE_API void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *d
439 * Remember this function will block until the callback is executed in the 439 * Remember this function will block until the callback is executed in the
440 * main loop. It can take time and you have no guaranty about the timeline. 440 * main loop. It can take time and you have no guaranty about the timeline.
441 */ 441 */
442ECORE_API void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data); 442EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data);
443 443
444/** 444/**
445 * @brief Waits for the next thread call in the main loop. 445 * @brief Waits for the next thread call in the main loop.
@@ -452,7 +452,7 @@ ECORE_API void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, vo
452 * is triggered from a thread or the time specified by wait has 452 * is triggered from a thread or the time specified by wait has
453 * passed. 453 * passed.
454 */ 454 */
455ECORE_API void ecore_main_loop_thread_safe_call_wait(double wait); 455EAPI void ecore_main_loop_thread_safe_call_wait(double wait);
456 456
457/** 457/**
458 * @brief This function suspends the main loop in a know state. 458 * @brief This function suspends the main loop in a know state.
@@ -472,7 +472,7 @@ ECORE_API void ecore_main_loop_thread_safe_call_wait(double wait);
472 * We still advise you, when possible, to use ecore_main_loop_thread_safe_call_async() 472 * We still advise you, when possible, to use ecore_main_loop_thread_safe_call_async()
473 * as it will not block the thread nor the main loop. 473 * as it will not block the thread nor the main loop.
474 */ 474 */
475ECORE_API int ecore_thread_main_loop_begin(void); 475EAPI int ecore_thread_main_loop_begin(void);
476 476
477/** 477/**
478 * @brief Unlocks the main loop. 478 * @brief Unlocks the main loop.
@@ -485,7 +485,7 @@ ECORE_API int ecore_thread_main_loop_begin(void);
485 * After a call to ecore_thread_main_loop_begin(), you need to absolutely 485 * After a call to ecore_thread_main_loop_begin(), you need to absolutely
486 * call ecore_thread_main_loop_end(), or you application will stay frozen. 486 * call ecore_thread_main_loop_end(), or you application will stay frozen.
487 */ 487 */
488ECORE_API int ecore_thread_main_loop_end(void); 488EAPI int ecore_thread_main_loop_end(void);
489 489
490/** 490/**
491 * @} 491 * @}
@@ -694,7 +694,7 @@ struct _Ecore_Event_Signal_Realtime
694 * event, so all handler set to handle that event type that have not already 694 * event, so all handler set to handle that event type that have not already
695 * been called, will not be. 695 * been called, will not be.
696 */ 696 */
697ECORE_API Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data); 697EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data);
698 698
699/** 699/**
700 * @brief Adds an event handler to the beginning of the handler list. 700 * @brief Adds an event handler to the beginning of the handler list.
@@ -707,7 +707,7 @@ ECORE_API Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Han
707 * creates the handler at the start of the list. Do not use this function. 707 * creates the handler at the start of the list. Do not use this function.
708 * @since 1.21 708 * @since 1.21
709 */ 709 */
710ECORE_API Ecore_Event_Handler *ecore_event_handler_prepend(int type, Ecore_Event_Handler_Cb func, const void *data); 710EAPI Ecore_Event_Handler *ecore_event_handler_prepend(int type, Ecore_Event_Handler_Cb func, const void *data);
711 711
712/** 712/**
713 * @brief Deletes an event handler. 713 * @brief Deletes an event handler.
@@ -719,7 +719,7 @@ ECORE_API Ecore_Event_Handler *ecore_event_handler_prepend(int type, Ecore_Event
719 * handler was added by ecore_event_handler_add(). On failure @c NULL will be 719 * handler was added by ecore_event_handler_add(). On failure @c NULL will be
720 * returned. Once a handler is deleted it will no longer be called. 720 * returned. Once a handler is deleted it will no longer be called.
721 */ 721 */
722ECORE_API void *ecore_event_handler_del(Ecore_Event_Handler *event_handler); 722EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
723 723
724/** 724/**
725 * @brief Adds an event to the event queue. 725 * @brief Adds an event to the event queue.
@@ -736,7 +736,7 @@ ECORE_API void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
736 * cleaning up. If @p func_free is NULL, free() will be called with the private 736 * cleaning up. If @p func_free is NULL, free() will be called with the private
737 * structure pointer. 737 * structure pointer.
738 */ 738 */
739ECORE_API Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data); 739EAPI Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data);
740 740
741/** 741/**
742 * @brief Deletes an event from the queue. 742 * @brief Deletes an event from the queue.
@@ -749,7 +749,7 @@ ECORE_API Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_fre
749 * cleanup, and so if the free function depends on the data pointer to work, 749 * cleanup, and so if the free function depends on the data pointer to work,
750 * you should defer cleaning of this till the free function is called later. 750 * you should defer cleaning of this till the free function is called later.
751 */ 751 */
752ECORE_API void *ecore_event_del(Ecore_Event *event); 752EAPI void *ecore_event_del(Ecore_Event *event);
753 753
754/** 754/**
755 * @brief Gets the data associated with an #Ecore_Event_Handler. 755 * @brief Gets the data associated with an #Ecore_Event_Handler.
@@ -759,7 +759,7 @@ ECORE_API void *ecore_event_del(Ecore_Event *event);
759 * This function returns the data previously associated with @p eh by 759 * This function returns the data previously associated with @p eh by
760 * ecore_event_handler_add(). 760 * ecore_event_handler_add().
761 */ 761 */
762ECORE_API void *ecore_event_handler_data_get(Ecore_Event_Handler *eh); 762EAPI void *ecore_event_handler_data_get(Ecore_Event_Handler *eh);
763 763
764/** 764/**
765 * @brief Sets the data associated with an #Ecore_Event_Handler. 765 * @brief Sets the data associated with an #Ecore_Event_Handler.
@@ -770,7 +770,7 @@ ECORE_API void *ecore_event_handler_data_get(Ecore_Event_Handler *eh);
770 * This function sets @p data to @p eh and returns the old data pointer 770 * This function sets @p data to @p eh and returns the old data pointer
771 * which was previously associated with @p eh by ecore_event_handler_add(). 771 * which was previously associated with @p eh by ecore_event_handler_add().
772 */ 772 */
773ECORE_API void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data); 773EAPI void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data);
774 774
775/** 775/**
776 * @brief Allocates a new event type id sensibly and returns the new id. 776 * @brief Allocates a new event type id sensibly and returns the new id.
@@ -782,7 +782,7 @@ ECORE_API void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void
782 * it is calculated, except that the ID will be unique to the current instance 782 * it is calculated, except that the ID will be unique to the current instance
783 * of the process. 783 * of the process.
784 */ 784 */
785ECORE_API int ecore_event_type_new(void); 785EAPI int ecore_event_type_new(void);
786 786
787/** 787/**
788 * @brief Forcefully flush all pending type without processing them 788 * @brief Forcefully flush all pending type without processing them
@@ -792,7 +792,7 @@ ECORE_API int ecore_event_type_new(void);
792 * This function is to be called before calling ecore_shutdown() if any event 792 * This function is to be called before calling ecore_shutdown() if any event
793 * has still a chance to be in the ecore event queue. 793 * has still a chance to be in the ecore event queue.
794 */ 794 */
795ECORE_API void ecore_event_type_flush_internal(int type, ...); 795EAPI void ecore_event_type_flush_internal(int type, ...);
796 796
797/** 797/**
798 * @brief Forcefully flush all pending type without processing them 798 * @brief Forcefully flush all pending type without processing them
@@ -825,7 +825,7 @@ ECORE_API void ecore_event_type_flush_internal(int type, ...);
825 * called and is passed the loop_data(returned by @c func_start) and @p data 825 * called and is passed the loop_data(returned by @c func_start) and @p data
826 * pointer to clean up. 826 * pointer to clean up.
827 */ 827 */
828ECORE_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); 828EAPI 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);
829 829
830/** 830/**
831 * @brief Deletes an event filter. 831 * @brief Deletes an event filter.
@@ -834,7 +834,7 @@ ECORE_API Ecore_Event_Filter *ecore_event_filter_add(Ecore_Data_Cb func_start, E
834 * 834 *
835 * Delete a filter that has been added by its @p ef handle. 835 * Delete a filter that has been added by its @p ef handle.
836 */ 836 */
837ECORE_API void *ecore_event_filter_del(Ecore_Event_Filter *ef); 837EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef);
838 838
839/** 839/**
840 * @brief Returns the current event type being handled. 840 * @brief Returns the current event type being handled.
@@ -850,7 +850,7 @@ ECORE_API void *ecore_event_filter_del(Ecore_Event_Filter *ef);
850 * the program know if the event type being handled is one it wants to get more 850 * the program know if the event type being handled is one it wants to get more
851 * information about. 851 * information about.
852 */ 852 */
853ECORE_API int ecore_event_current_type_get(void); 853EAPI int ecore_event_current_type_get(void);
854 854
855/** 855/**
856 * @brief Returns the current event type pointer handled. 856 * @brief Returns the current event type pointer handled.
@@ -866,7 +866,7 @@ ECORE_API int ecore_event_current_type_get(void);
866 * the program access the event data if the type of the event is handled by 866 * the program access the event data if the type of the event is handled by
867 * the program. 867 * the program.
868 */ 868 */
869ECORE_API void *ecore_event_current_event_get(void); 869EAPI void *ecore_event_current_event_get(void);
870 870
871/** 871/**
872 * @} 872 * @}
@@ -931,7 +931,7 @@ typedef enum _Ecore_Memory_State Ecore_Memory_State;
931 * @return The current memory state for the system as a whole. 931 * @return The current memory state for the system as a whole.
932 * @since 1.8 932 * @since 1.8
933 */ 933 */
934ECORE_API Ecore_Memory_State ecore_memory_state_get(void); 934EAPI Ecore_Memory_State ecore_memory_state_get(void);
935 935
936/** 936/**
937 * @brief Sets the memory state. 937 * @brief Sets the memory state.
@@ -947,7 +947,7 @@ ECORE_API Ecore_Memory_State ecore_memory_state_get(void);
947 * 947 *
948 * @since 1.8 948 * @since 1.8
949 */ 949 */
950ECORE_API void ecore_memory_state_set(Ecore_Memory_State state); 950EAPI void ecore_memory_state_set(Ecore_Memory_State state);
951 951
952 952
953/** 953/**
@@ -970,7 +970,7 @@ typedef enum _Ecore_Power_State Ecore_Power_State;
970 * @return The current power state for the system. 970 * @return The current power state for the system.
971 * @since 1.8 971 * @since 1.8
972 */ 972 */
973ECORE_API Ecore_Power_State ecore_power_state_get(void); 973EAPI Ecore_Power_State ecore_power_state_get(void);
974 974
975/** 975/**
976 * @brief Sets the power state. 976 * @brief Sets the power state.
@@ -986,7 +986,7 @@ ECORE_API Ecore_Power_State ecore_power_state_get(void);
986 * 986 *
987 * @since 1.8 987 * @since 1.8
988 */ 988 */
989ECORE_API void ecore_power_state_set(Ecore_Power_State state); 989EAPI void ecore_power_state_set(Ecore_Power_State state);
990 990
991/** 991/**
992 * @} 992 * @}
@@ -1014,10 +1014,10 @@ ECORE_API void ecore_power_state_set(Ecore_Power_State state);
1014/** Inherit priority from parent process */ 1014/** Inherit priority from parent process */
1015#define ECORE_EXE_PRIORITY_INHERIT 9999 1015#define ECORE_EXE_PRIORITY_INHERIT 9999
1016 1016
1017ECORE_API extern int ECORE_EXE_EVENT_ADD; /**< A child process has been added */ 1017EAPI extern int ECORE_EXE_EVENT_ADD; /**< A child process has been added */
1018ECORE_API extern int ECORE_EXE_EVENT_DEL; /**< A child process has been deleted (it exited, naming consistent with the rest of ecore). */ 1018EAPI extern int ECORE_EXE_EVENT_DEL; /**< A child process has been deleted (it exited, naming consistent with the rest of ecore). */
1019ECORE_API extern int ECORE_EXE_EVENT_DATA; /**< Data from a child process. */ 1019EAPI extern int ECORE_EXE_EVENT_DATA; /**< Data from a child process. */
1020ECORE_API extern int ECORE_EXE_EVENT_ERROR; /**< Errors from a child process. */ 1020EAPI extern int ECORE_EXE_EVENT_ERROR; /**< Errors from a child process. */
1021 1021
1022/** 1022/**
1023 * @enum _Ecore_Exe_Win32_Priority 1023 * @enum _Ecore_Exe_Win32_Priority
@@ -1093,7 +1093,7 @@ struct _Ecore_Exe_Event_Del
1093 * to @c 19 or @ref ECORE_EXE_PRIORITY_INHERIT on other OS. 1093 * to @c 19 or @ref ECORE_EXE_PRIORITY_INHERIT on other OS.
1094 * 1094 *
1095 */ 1095 */
1096ECORE_API void ecore_exe_run_priority_set(int pri); 1096EAPI void ecore_exe_run_priority_set(int pri);
1097 1097
1098/** 1098/**
1099 * Gets the priority at which to launch processes. 1099 * Gets the priority at which to launch processes.
@@ -1104,7 +1104,7 @@ ECORE_API void ecore_exe_run_priority_set(int pri);
1104 * 1104 *
1105 * @return The value set by ecore_exe_run_priority_set() 1105 * @return The value set by ecore_exe_run_priority_set()
1106 */ 1106 */
1107ECORE_API int ecore_exe_run_priority_get(void); 1107EAPI int ecore_exe_run_priority_get(void);
1108 1108
1109/** 1109/**
1110 * Spawns a child process. 1110 * Spawns a child process.
@@ -1119,7 +1119,7 @@ ECORE_API int ecore_exe_run_priority_get(void);
1119 * appropriated flags. 1119 * appropriated flags.
1120 * 1120 *
1121 */ 1121 */
1122ECORE_API Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data); 1122EAPI Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
1123 1123
1124/** 1124/**
1125 * Spawns a child process with its stdin/out available for communication. 1125 * Spawns a child process with its stdin/out available for communication.
@@ -1146,7 +1146,7 @@ ECORE_API Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
1146 * @param data Data to attach to the returned process handle. 1146 * @param data Data to attach to the returned process handle.
1147 * @return A process handle to the spawned process. 1147 * @return A process handle to the spawned process.
1148 */ 1148 */
1149ECORE_API Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data); 1149EAPI Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data);
1150 1150
1151/** 1151/**
1152 * Defines a function to be called before really freeing the handle data. 1152 * Defines a function to be called before really freeing the handle data.
@@ -1161,7 +1161,7 @@ ECORE_API Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags fla
1161 * @param exe The child process to attach the pre_free function. 1161 * @param exe The child process to attach the pre_free function.
1162 * @param func The function to call before @a exe is freed. 1162 * @param func The function to call before @a exe is freed.
1163 */ 1163 */
1164ECORE_API void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func); 1164EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func);
1165 1165
1166/** 1166/**
1167 * Sends data to the given child process which it receives on stdin. 1167 * Sends data to the given child process which it receives on stdin.
@@ -1175,14 +1175,14 @@ ECORE_API void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func
1175 * @param size The size of the data to send, in bytes 1175 * @param size The size of the data to send, in bytes
1176 * @return @c EINA_TRUE if successful, @c EINA_FALSE on failure. 1176 * @return @c EINA_TRUE if successful, @c EINA_FALSE on failure.
1177 */ 1177 */
1178ECORE_API Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size); 1178EAPI Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size);
1179 1179
1180/** 1180/**
1181 * The stdin of the given child process will close when the write buffer is empty. 1181 * The stdin of the given child process will close when the write buffer is empty.
1182 * 1182 *
1183 * @param exe The child process 1183 * @param exe The child process
1184 */ 1184 */
1185ECORE_API void ecore_exe_close_stdin(Ecore_Exe *exe); 1185EAPI void ecore_exe_close_stdin(Ecore_Exe *exe);
1186 1186
1187/** 1187/**
1188 * Sets the auto pipe limits for the given process handle. On Windows 1188 * Sets the auto pipe limits for the given process handle. On Windows
@@ -1195,7 +1195,7 @@ ECORE_API void ecore_exe_close_stdin(Ecore_Exe *exe);
1195 * @param end_lines Limit of lines at end of output to buffer. 1195 * @param end_lines Limit of lines at end of output to buffer.
1196 * 1196 *
1197 */ 1197 */
1198ECORE_API void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines); 1198EAPI void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines);
1199 1199
1200/** 1200/**
1201 * Gets the auto pipe data for the given process handle 1201 * Gets the auto pipe data for the given process handle
@@ -1204,14 +1204,14 @@ ECORE_API void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int en
1204 * @param flags Is this a ECORE_EXE_PIPE_READ or ECORE_EXE_PIPE_ERROR? 1204 * @param flags Is this a ECORE_EXE_PIPE_READ or ECORE_EXE_PIPE_ERROR?
1205 * @return The event data. 1205 * @return The event data.
1206 */ 1206 */
1207ECORE_API Ecore_Exe_Event_Data *ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags); 1207EAPI Ecore_Exe_Event_Data *ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags);
1208 1208
1209/** 1209/**
1210 * Frees the given event data. 1210 * Frees the given event data.
1211 * 1211 *
1212 * @param data The given event data. 1212 * @param data The given event data.
1213 */ 1213 */
1214ECORE_API void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data); 1214EAPI void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data);
1215 1215
1216/** 1216/**
1217 * Frees the given process handle. 1217 * Frees the given process handle.
@@ -1223,14 +1223,14 @@ ECORE_API void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data);
1223 * @return The data attached to the handle when @ref ecore_exe_run was 1223 * @return The data attached to the handle when @ref ecore_exe_run was
1224 * called. 1224 * called.
1225 */ 1225 */
1226ECORE_API void *ecore_exe_free(Ecore_Exe *exe); 1226EAPI void *ecore_exe_free(Ecore_Exe *exe);
1227 1227
1228/** 1228/**
1229 * Retrieves the process ID of the given spawned process. 1229 * Retrieves the process ID of the given spawned process.
1230 * @param exe Handle to the given spawned process. 1230 * @param exe Handle to the given spawned process.
1231 * @return The process ID on success, @c -1 otherwise. 1231 * @return The process ID on success, @c -1 otherwise.
1232 */ 1232 */
1233ECORE_API pid_t ecore_exe_pid_get(const Ecore_Exe *exe); 1233EAPI pid_t ecore_exe_pid_get(const Ecore_Exe *exe);
1234 1234
1235/** 1235/**
1236 * Sets the string tag for the given process handle. 1236 * Sets the string tag for the given process handle.
@@ -1238,7 +1238,7 @@ ECORE_API pid_t ecore_exe_pid_get(const Ecore_Exe *exe);
1238 * @param exe The given process handle. 1238 * @param exe The given process handle.
1239 * @param tag The string tag to set on the process handle. 1239 * @param tag The string tag to set on the process handle.
1240 */ 1240 */
1241ECORE_API void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag); 1241EAPI void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag);
1242 1242
1243/** 1243/**
1244 * Retrieves the tag attached to the given process handle. There is no need to 1244 * Retrieves the tag attached to the given process handle. There is no need to
@@ -1251,7 +1251,7 @@ ECORE_API void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag);
1251 * internal string and should not be modified, use 1251 * internal string and should not be modified, use
1252 * ecore_exe_tag_set() to change it. It might be @c NULL. 1252 * ecore_exe_tag_set() to change it. It might be @c NULL.
1253 */ 1253 */
1254ECORE_API const char *ecore_exe_tag_get(const Ecore_Exe *exe); 1254EAPI const char *ecore_exe_tag_get(const Ecore_Exe *exe);
1255 1255
1256/** 1256/**
1257 * Retrieves the command of the given spawned process. 1257 * Retrieves the command of the given spawned process.
@@ -1260,7 +1260,7 @@ ECORE_API const char *ecore_exe_tag_get(const Ecore_Exe *exe);
1260 * pointer to the internal value and must not be modified in 1260 * pointer to the internal value and must not be modified in
1261 * any way. 1261 * any way.
1262 */ 1262 */
1263ECORE_API const char *ecore_exe_cmd_get(const Ecore_Exe *exe); 1263EAPI const char *ecore_exe_cmd_get(const Ecore_Exe *exe);
1264 1264
1265/** 1265/**
1266 * Retrieves the data attached to the given process handle. 1266 * Retrieves the data attached to the given process handle.
@@ -1268,7 +1268,7 @@ ECORE_API const char *ecore_exe_cmd_get(const Ecore_Exe *exe);
1268 * @return The data pointer attached to @p exe Given to 1268 * @return The data pointer attached to @p exe Given to
1269 * ecore_exe_run() or ecore_exe_pipe_run() 1269 * ecore_exe_run() or ecore_exe_pipe_run()
1270 */ 1270 */
1271ECORE_API void *ecore_exe_data_get(const Ecore_Exe *exe); 1271EAPI void *ecore_exe_data_get(const Ecore_Exe *exe);
1272 1272
1273/** 1273/**
1274 * Sets the data attached to the given process handle. 1274 * Sets the data attached to the given process handle.
@@ -1278,50 +1278,50 @@ ECORE_API void *ecore_exe_data_get(const Ecore_Exe *exe);
1278 * ecore_exe_run(), ecore_exe_pipe_run(), or ecore_exe_data_set() 1278 * ecore_exe_run(), ecore_exe_pipe_run(), or ecore_exe_data_set()
1279 * @since 1.1 1279 * @since 1.1
1280 */ 1280 */
1281ECORE_API void *ecore_exe_data_set(Ecore_Exe *exe, void *data); 1281EAPI void *ecore_exe_data_set(Ecore_Exe *exe, void *data);
1282 1282
1283/** 1283/**
1284 * Retrieves the flags attached to the given process handle. 1284 * Retrieves the flags attached to the given process handle.
1285 * @param exe The given process handle. 1285 * @param exe The given process handle.
1286 * @return The flags attached to @p exe. 1286 * @return The flags attached to @p exe.
1287 */ 1287 */
1288ECORE_API Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *exe); 1288EAPI Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *exe);
1289 1289
1290/** 1290/**
1291 * Pauses the given process by sending it a @c SIGSTOP signal. 1291 * Pauses the given process by sending it a @c SIGSTOP signal.
1292 * @param exe Process handle to the given process. 1292 * @param exe Process handle to the given process.
1293 */ 1293 */
1294ECORE_API void ecore_exe_pause(Ecore_Exe *exe); 1294EAPI void ecore_exe_pause(Ecore_Exe *exe);
1295 1295
1296/** 1296/**
1297 * Continues the given paused process by sending it a @c SIGCONT signal. 1297 * Continues the given paused process by sending it a @c SIGCONT signal.
1298 * @param exe Process handle to the given process. 1298 * @param exe Process handle to the given process.
1299 */ 1299 */
1300ECORE_API void ecore_exe_continue(Ecore_Exe *exe); 1300EAPI void ecore_exe_continue(Ecore_Exe *exe);
1301 1301
1302/** 1302/**
1303 * Sends the given spawned process a interrupt (@c SIGINT) signal. 1303 * Sends the given spawned process a interrupt (@c SIGINT) signal.
1304 * @param exe Process handle to the given process. 1304 * @param exe Process handle to the given process.
1305 */ 1305 */
1306ECORE_API void ecore_exe_interrupt(Ecore_Exe *exe); 1306EAPI void ecore_exe_interrupt(Ecore_Exe *exe);
1307 1307
1308/** 1308/**
1309 * Sends the given spawned process a quit (@c SIGQUIT) signal. 1309 * Sends the given spawned process a quit (@c SIGQUIT) signal.
1310 * @param exe Process handle to the given process. 1310 * @param exe Process handle to the given process.
1311 */ 1311 */
1312ECORE_API void ecore_exe_quit(Ecore_Exe *exe); 1312EAPI void ecore_exe_quit(Ecore_Exe *exe);
1313 1313
1314/** 1314/**
1315 * Sends the given spawned process a terminate (@c SIGTERM) signal. 1315 * Sends the given spawned process a terminate (@c SIGTERM) signal.
1316 * @param exe Process handle to the given process. 1316 * @param exe Process handle to the given process.
1317 */ 1317 */
1318ECORE_API void ecore_exe_terminate(Ecore_Exe *exe); 1318EAPI void ecore_exe_terminate(Ecore_Exe *exe);
1319 1319
1320/** 1320/**
1321 * Kills the given spawned process by sending it a @c SIGKILL signal. 1321 * Kills the given spawned process by sending it a @c SIGKILL signal.
1322 * @param exe Process handle to the given process. 1322 * @param exe Process handle to the given process.
1323 */ 1323 */
1324ECORE_API void ecore_exe_kill(Ecore_Exe *exe); 1324EAPI void ecore_exe_kill(Ecore_Exe *exe);
1325 1325
1326/** 1326/**
1327 * Sends a @c SIGUSR signal to the given spawned process. 1327 * Sends a @c SIGUSR signal to the given spawned process.
@@ -1329,13 +1329,13 @@ ECORE_API void ecore_exe_kill(Ecore_Exe *exe);
1329 * @param num The number user signal to send. Must be either @c 1 or @c 2, or 1329 * @param num The number user signal to send. Must be either @c 1 or @c 2, or
1330 * the signal will be ignored. 1330 * the signal will be ignored.
1331 */ 1331 */
1332ECORE_API void ecore_exe_signal(Ecore_Exe *exe, int num); 1332EAPI void ecore_exe_signal(Ecore_Exe *exe, int num);
1333 1333
1334/** 1334/**
1335 * Sends a @c SIGHUP signal to the given spawned process. 1335 * Sends a @c SIGHUP signal to the given spawned process.
1336 * @param exe Process handle to the given process. 1336 * @param exe Process handle to the given process.
1337 */ 1337 */
1338ECORE_API void ecore_exe_hup(Ecore_Exe *exe); 1338EAPI void ecore_exe_hup(Ecore_Exe *exe);
1339 1339
1340/** 1340/**
1341 * @} 1341 * @}
@@ -1453,7 +1453,7 @@ typedef Eina_Bool (*Ecore_Win32_Handle_Cb)(void *data, Ecore_Win32_Handler *wh);
1453 * @warning This function should @b not be used for monitoring "normal" files, like text files. 1453 * @warning This function should @b not be used for monitoring "normal" files, like text files.
1454 * 1454 *
1455 */ 1455 */
1456ECORE_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); 1456EAPI 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);
1457 1457
1458/** 1458/**
1459 * @brief Adds a callback for activity on the given file descriptor. 1459 * @brief Adds a callback for activity on the given file descriptor.
@@ -1475,7 +1475,7 @@ ECORE_API Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_F
1475 * 1475 *
1476 * @since 1.7 1476 * @since 1.7
1477 */ 1477 */
1478ECORE_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); 1478EAPI 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);
1479 1479
1480/** 1480/**
1481 * @brief Sets the prepare callback with data for a given #Ecore_Fd_Handler. 1481 * @brief Sets the prepare callback with data for a given #Ecore_Fd_Handler.
@@ -1493,7 +1493,7 @@ ECORE_API Ecore_Fd_Handler *ecore_main_fd_handler_file_add(int fd, Ecore_Fd_Hand
1493 * @note You probably don't need this function. It is only necessary for very 1493 * @note You probably don't need this function. It is only necessary for very
1494 * uncommon cases that need special behavior. 1494 * uncommon cases that need special behavior.
1495 */ 1495 */
1496ECORE_API void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data); 1496EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data);
1497/** 1497/**
1498 * @brief Marks an FD handler for deletion. 1498 * @brief Marks an FD handler for deletion.
1499 * @param fd_handler The FD handler. 1499 * @param fd_handler The FD handler.
@@ -1507,13 +1507,13 @@ ECORE_API void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_h
1507 * cause crashes and instability. Remember to delete your fd handlers before the 1507 * cause crashes and instability. Remember to delete your fd handlers before the
1508 * fds they listen to are closed. 1508 * fds they listen to are closed.
1509 */ 1509 */
1510ECORE_API void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler); 1510EAPI void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
1511/** 1511/**
1512 * @brief Retrieves the file descriptor that the given handler is handling. 1512 * @brief Retrieves the file descriptor that the given handler is handling.
1513 * @param fd_handler The given FD handler. 1513 * @param fd_handler The given FD handler.
1514 * @return The file descriptor the handler is watching. 1514 * @return The file descriptor the handler is watching.
1515 */ 1515 */
1516ECORE_API int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler); 1516EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
1517/** 1517/**
1518 * @brief Gets which flags are active on an FD handler. 1518 * @brief Gets which flags are active on an FD handler.
1519 * @param fd_handler The given FD handler. 1519 * @param fd_handler The given FD handler.
@@ -1522,13 +1522,13 @@ ECORE_API int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
1522 * @return @c EINA_TRUE if any of the given flags are active, @c EINA_FALSE 1522 * @return @c EINA_TRUE if any of the given flags are active, @c EINA_FALSE
1523 * otherwise. 1523 * otherwise.
1524 */ 1524 */
1525ECORE_API Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); 1525EAPI Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
1526/** 1526/**
1527 * @brief Sets what active streams the given FD handler should be monitoring. 1527 * @brief Sets what active streams the given FD handler should be monitoring.
1528 * @param fd_handler The given FD handler. 1528 * @param fd_handler The given FD handler.
1529 * @param flags The flags to be watching. 1529 * @param flags The flags to be watching.
1530 */ 1530 */
1531ECORE_API void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); 1531EAPI void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
1532 1532
1533/** 1533/**
1534 * @brief Creates a Ecore_Win32_Handler object and add it to the win32_handlers list. 1534 * @brief Creates a Ecore_Win32_Handler object and add it to the win32_handlers list.
@@ -1536,14 +1536,14 @@ ECORE_API void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ec
1536 * @param func The function to add as a callback. 1536 * @param func The function to add as a callback.
1537 * @param data The data to pass to the callback when it is called. 1537 * @param data The data to pass to the callback when it is called.
1538 */ 1538 */
1539ECORE_API Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data); 1539EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data);
1540/** 1540/**
1541 * @brief Sets Ecore_Win32_Handler object to delete state. 1541 * @brief Sets Ecore_Win32_Handler object to delete state.
1542 * The handler will be deleted in the _ecore_main_win32_handlers_cleanup function. 1542 * The handler will be deleted in the _ecore_main_win32_handlers_cleanup function.
1543 * 1543 *
1544 * @param win32_handler The Ecore_Win32_Handler object. 1544 * @param win32_handler The Ecore_Win32_Handler object.
1545 */ 1545 */
1546ECORE_API void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler); 1546EAPI void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler);
1547 1547
1548/** 1548/**
1549 * @} 1549 * @}
@@ -1575,7 +1575,7 @@ ECORE_API void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler)
1575 * @see ecore_loop_time_get(). 1575 * @see ecore_loop_time_get().
1576 * @see ecore_time_unix_get(). 1576 * @see ecore_time_unix_get().
1577 */ 1577 */
1578ECORE_API double ecore_time_get(void); 1578EAPI double ecore_time_get(void);
1579 1579
1580/** 1580/**
1581 * Retrieves the current UNIX time as a floating point value in seconds. 1581 * Retrieves the current UNIX time as a floating point value in seconds.
@@ -1585,7 +1585,7 @@ ECORE_API double ecore_time_get(void);
1585 * 1585 *
1586 * @return The number of seconds since 12.00AM 1st January 1970. 1586 * @return The number of seconds since 12.00AM 1st January 1970.
1587 */ 1587 */
1588ECORE_API double ecore_time_unix_get(void); 1588EAPI double ecore_time_unix_get(void);
1589 1589
1590/** 1590/**
1591 * Retrieves the time at which the last loop stopped waiting for timeouts or 1591 * Retrieves the time at which the last loop stopped waiting for timeouts or
@@ -1608,7 +1608,7 @@ ECORE_API double ecore_time_unix_get(void);
1608 * defined is that it never goes backwards (unless you got big critical 1608 * defined is that it never goes backwards (unless you got big critical
1609 * messages when the application started). 1609 * messages when the application started).
1610 */ 1610 */
1611ECORE_API double ecore_loop_time_get(void); 1611EAPI double ecore_loop_time_get(void);
1612 1612
1613/** 1613/**
1614 * Sets the loop time. 1614 * Sets the loop time.
@@ -1631,7 +1631,7 @@ ECORE_API double ecore_loop_time_get(void);
1631 * @see ecore_loop_time_get() 1631 * @see ecore_loop_time_get()
1632 * @since 1.11 1632 * @since 1.11
1633 */ 1633 */
1634ECORE_API void ecore_loop_time_set(double t); 1634EAPI void ecore_loop_time_set(double t);
1635 1635
1636/** 1636/**
1637 * @} 1637 * @}
@@ -1798,7 +1798,7 @@ typedef void (*Ecore_Thread_Notify_Cb)(void *data, Ecore_Thread *thread, void *m
1798 * @see ecore_thread_reschedule() 1798 * @see ecore_thread_reschedule()
1799 * @see ecore_thread_max_set() 1799 * @see ecore_thread_max_set()
1800 */ 1800 */
1801ECORE_API Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data); 1801EAPI Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data);
1802 1802
1803/** 1803/**
1804 * Launches a thread to run a task that can talk back to the main thread. 1804 * Launches a thread to run a task that can talk back to the main thread.
@@ -1840,7 +1840,7 @@ ECORE_API Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Th
1840 * @see ecore_thread_reschedule() 1840 * @see ecore_thread_reschedule()
1841 * @see ecore_thread_max_set() 1841 * @see ecore_thread_max_set()
1842 */ 1842 */
1843ECORE_API Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify, 1843EAPI Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify,
1844 Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, 1844 Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel,
1845 const void *data, Eina_Bool try_no_queue); 1845 const void *data, Eina_Bool try_no_queue);
1846 1846
@@ -1891,7 +1891,7 @@ ECORE_API Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ec
1891 * @see ecore_thread_check() 1891 * @see ecore_thread_check()
1892 * @see eina_thread_cancellable_run() 1892 * @see eina_thread_cancellable_run()
1893 */ 1893 */
1894ECORE_API Eina_Bool ecore_thread_cancel(Ecore_Thread *thread); 1894EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
1895 1895
1896/** 1896/**
1897 * @brief Blocks the main loop until the thread execution is over. 1897 * @brief Blocks the main loop until the thread execution is over.
@@ -1904,7 +1904,7 @@ ECORE_API Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
1904 * Note: This function should only be called in the main loop. 1904 * Note: This function should only be called in the main loop.
1905 * 1905 *
1906 */ 1906 */
1907ECORE_API Eina_Bool ecore_thread_wait(Ecore_Thread *thread, double wait); 1907EAPI Eina_Bool ecore_thread_wait(Ecore_Thread *thread, double wait);
1908 1908
1909/** 1909/**
1910 * Checks if a thread is pending cancellation. 1910 * Checks if a thread is pending cancellation.
@@ -1925,7 +1925,7 @@ ECORE_API Eina_Bool ecore_thread_wait(Ecore_Thread *thread, double wait);
1925 * 1925 *
1926 * @see ecore_thread_cancel() 1926 * @see ecore_thread_cancel()
1927 */ 1927 */
1928ECORE_API Eina_Bool ecore_thread_check(Ecore_Thread *thread); 1928EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread);
1929 1929
1930/** 1930/**
1931 * Sends data from the worker thread to the main loop. 1931 * Sends data from the worker thread to the main loop.
@@ -1948,7 +1948,7 @@ ECORE_API Eina_Bool ecore_thread_check(Ecore_Thread *thread);
1948 * 1948 *
1949 * @see ecore_thread_feedback_run() 1949 * @see ecore_thread_feedback_run()
1950 */ 1950 */
1951ECORE_API Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data); 1951EAPI Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data);
1952 1952
1953/** 1953/**
1954 * Asks for the function in the thread to be called again at a later time. 1954 * Asks for the function in the thread to be called again at a later time.
@@ -1973,7 +1973,7 @@ ECORE_API Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_
1973 * Similarly, if the @p thread is cancelled, the reschedule will not take 1973 * Similarly, if the @p thread is cancelled, the reschedule will not take
1974 * effect. 1974 * effect.
1975 */ 1975 */
1976ECORE_API Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread); 1976EAPI Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread);
1977 1977
1978/** 1978/**
1979 * Gets the number of active threads running jobs. 1979 * Gets the number of active threads running jobs.
@@ -1988,7 +1988,7 @@ ECORE_API Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread);
1988 * in the return of this function unless the thread creation fails and it 1988 * in the return of this function unless the thread creation fails and it
1989 * falls back to using one from the pool. 1989 * falls back to using one from the pool.
1990 */ 1990 */
1991ECORE_API int ecore_thread_active_get(void); 1991EAPI int ecore_thread_active_get(void);
1992 1992
1993/** 1993/**
1994 * Gets the number of short jobs waiting for a thread to run. 1994 * Gets the number of short jobs waiting for a thread to run.
@@ -1998,7 +1998,7 @@ ECORE_API int ecore_thread_active_get(void);
1998 * This returns the number of tasks started with ecore_thread_run() that are 1998 * This returns the number of tasks started with ecore_thread_run() that are
1999 * pending, waiting for a thread to become available to run them. 1999 * pending, waiting for a thread to become available to run them.
2000 */ 2000 */
2001ECORE_API int ecore_thread_pending_get(void); 2001EAPI int ecore_thread_pending_get(void);
2002 2002
2003/** 2003/**
2004 * Gets the number of feedback jobs waiting for a thread to run. 2004 * Gets the number of feedback jobs waiting for a thread to run.
@@ -2008,7 +2008,7 @@ ECORE_API int ecore_thread_pending_get(void);
2008 * This returns the number of tasks started with ecore_thread_feedback_run() 2008 * This returns the number of tasks started with ecore_thread_feedback_run()
2009 * that are pending, waiting for a thread to become available to run them. 2009 * that are pending, waiting for a thread to become available to run them.
2010 */ 2010 */
2011ECORE_API int ecore_thread_pending_feedback_get(void); 2011EAPI int ecore_thread_pending_feedback_get(void);
2012 2012
2013/** 2013/**
2014 * Gets the total number of pending jobs. 2014 * Gets the total number of pending jobs.
@@ -2018,7 +2018,7 @@ ECORE_API int ecore_thread_pending_feedback_get(void);
2018 * Same as the sum of ecore_thread_pending_get() and 2018 * Same as the sum of ecore_thread_pending_get() and
2019 *ecore_thread_pending_feedback_get(). 2019 *ecore_thread_pending_feedback_get().
2020 */ 2020 */
2021ECORE_API int ecore_thread_pending_total_get(void); 2021EAPI int ecore_thread_pending_total_get(void);
2022 2022
2023/** 2023/**
2024 * Gets the maximum number of threads that can run simultaneously. 2024 * Gets the maximum number of threads that can run simultaneously.
@@ -2038,7 +2038,7 @@ ECORE_API int ecore_thread_pending_total_get(void);
2038 * @see ecore_thread_max_set() 2038 * @see ecore_thread_max_set()
2039 * @see ecore_thread_max_reset() 2039 * @see ecore_thread_max_reset()
2040 */ 2040 */
2041ECORE_API int ecore_thread_max_get(void); 2041EAPI int ecore_thread_max_get(void);
2042 2042
2043/** 2043/**
2044 * Sets the maximum number of threads allowed to run simultaneously. 2044 * Sets the maximum number of threads allowed to run simultaneously.
@@ -2054,7 +2054,7 @@ ECORE_API int ecore_thread_max_get(void);
2054 * @see ecore_thread_max_get() 2054 * @see ecore_thread_max_get()
2055 * @see ecore_thread_max_reset() 2055 * @see ecore_thread_max_reset()
2056 */ 2056 */
2057ECORE_API void ecore_thread_max_set(int num); 2057EAPI void ecore_thread_max_set(int num);
2058 2058
2059/** 2059/**
2060 * Resets the maximum number of concurrently running threads to the default. 2060 * Resets the maximum number of concurrently running threads to the default.
@@ -2065,7 +2065,7 @@ ECORE_API void ecore_thread_max_set(int num);
2065 * @see ecore_thread_max_get() 2065 * @see ecore_thread_max_get()
2066 * @see ecore_thread_max_set() 2066 * @see ecore_thread_max_set()
2067 */ 2067 */
2068ECORE_API void ecore_thread_max_reset(void); 2068EAPI void ecore_thread_max_reset(void);
2069 2069
2070/** 2070/**
2071 * Gets the number of threads available for running tasks. 2071 * Gets the number of threads available for running tasks.
@@ -2078,7 +2078,7 @@ ECORE_API void ecore_thread_max_reset(void);
2078 * changed the maximum number of running threads while other tasks are 2078 * changed the maximum number of running threads while other tasks are
2079 * running. 2079 * running.
2080 */ 2080 */
2081ECORE_API int ecore_thread_available_get(void); 2081EAPI int ecore_thread_available_get(void);
2082 2082
2083/** 2083/**
2084 * Adds some data to a hash local to the thread. 2084 * Adds some data to a hash local to the thread.
@@ -2164,7 +2164,7 @@ ECORE_API int ecore_thread_available_get(void);
2164 * @see ecore_thread_local_data_find() 2164 * @see ecore_thread_local_data_find()
2165 * @see ecore_thread_local_data_del() 2165 * @see ecore_thread_local_data_del()
2166 */ 2166 */
2167ECORE_API Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value, 2167EAPI Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value,
2168 Eina_Free_Cb cb, Eina_Bool direct); 2168 Eina_Free_Cb cb, Eina_Bool direct);
2169 2169
2170/** 2170/**
@@ -2194,7 +2194,7 @@ ECORE_API Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char
2194 * @see ecore_thread_local_data_del() 2194 * @see ecore_thread_local_data_del()
2195 * @see ecore_thread_local_data_find() 2195 * @see ecore_thread_local_data_find()
2196 */ 2196 */
2197ECORE_API void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb); 2197EAPI void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb);
2198 2198
2199/** 2199/**
2200 * Gets data stored in the hash local to the given thread. 2200 * Gets data stored in the hash local to the given thread.
@@ -2213,7 +2213,7 @@ ECORE_API void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *ke
2213 * @see ecore_thread_local_data_add() 2213 * @see ecore_thread_local_data_add()
2214 * @see ecore_thread_local_data_wait() 2214 * @see ecore_thread_local_data_wait()
2215 */ 2215 */
2216ECORE_API void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key); 2216EAPI void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key);
2217 2217
2218/** 2218/**
2219 * Deletes from the thread's hash the data corresponding to the given key. 2219 * Deletes from the thread's hash the data corresponding to the given key.
@@ -2239,7 +2239,7 @@ ECORE_API void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *k
2239 * 2239 *
2240 * @see ecore_thread_local_data_add() 2240 * @see ecore_thread_local_data_add()
2241 */ 2241 */
2242ECORE_API Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key); 2242EAPI Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key);
2243 2243
2244/** 2244/**
2245 * Adds some data to a hash shared by all threads. 2245 * Adds some data to a hash shared by all threads.
@@ -2279,7 +2279,7 @@ ECORE_API Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char
2279 * @see ecore_thread_global_data_set() 2279 * @see ecore_thread_global_data_set()
2280 * @see ecore_thread_global_data_find() 2280 * @see ecore_thread_global_data_find()
2281 */ 2281 */
2282ECORE_API Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct); 2282EAPI Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct);
2283 2283
2284/** 2284/**
2285 * Sets some data in the hash shared by all threads. 2285 * Sets some data in the hash shared by all threads.
@@ -2302,7 +2302,7 @@ ECORE_API Eina_Bool ecore_thread_global_data_add(const char *key, void *value, E
2302 * @see ecore_thread_global_data_del() 2302 * @see ecore_thread_global_data_del()
2303 * @see ecore_thread_global_data_find() 2303 * @see ecore_thread_global_data_find()
2304 */ 2304 */
2305ECORE_API void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb); 2305EAPI void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb);
2306 2306
2307/** 2307/**
2308 * Gets data stored in the hash shared by all threads. 2308 * Gets data stored in the hash shared by all threads.
@@ -2320,7 +2320,7 @@ ECORE_API void *ecore_thread_global_data_set(const char *key, void *value, Eina_
2320 * @see ecore_thread_global_data_add() 2320 * @see ecore_thread_global_data_add()
2321 * @see ecore_thread_global_data_wait() 2321 * @see ecore_thread_global_data_wait()
2322 */ 2322 */
2323ECORE_API void *ecore_thread_global_data_find(const char *key); 2323EAPI void *ecore_thread_global_data_find(const char *key);
2324 2324
2325/** 2325/**
2326 * Deletes from the shared hash the data corresponding to the given key. 2326 * Deletes from the shared hash the data corresponding to the given key.
@@ -2344,7 +2344,7 @@ ECORE_API void *ecore_thread_global_data_find(const char *key);
2344 * 2344 *
2345 * @see ecore_thread_global_data_add() 2345 * @see ecore_thread_global_data_add()
2346 */ 2346 */
2347ECORE_API Eina_Bool ecore_thread_global_data_del(const char *key); 2347EAPI Eina_Bool ecore_thread_global_data_del(const char *key);
2348 2348
2349/** 2349/**
2350 * Gets data stored in the shared hash, or wait for it if it doesn't exist. 2350 * Gets data stored in the shared hash, or wait for it if it doesn't exist.
@@ -2373,7 +2373,7 @@ ECORE_API Eina_Bool ecore_thread_global_data_del(const char *key);
2373 * @see ecore_thread_global_data_add() 2373 * @see ecore_thread_global_data_add()
2374 * @see ecore_thread_global_data_find() 2374 * @see ecore_thread_global_data_find()
2375 */ 2375 */
2376ECORE_API void *ecore_thread_global_data_wait(const char *key, double seconds); 2376EAPI void *ecore_thread_global_data_wait(const char *key, double seconds);
2377 2377
2378/** 2378/**
2379 * @} 2379 * @}
@@ -2418,7 +2418,7 @@ typedef void (*Ecore_Pipe_Cb)(void *data, void *buffer, unsigned int nbyte);
2418 * @return A newly created Ecore_Pipe object if successful, 2418 * @return A newly created Ecore_Pipe object if successful,
2419 * @c NULL otherwise. 2419 * @c NULL otherwise.
2420 */ 2420 */
2421ECORE_API Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data); 2421EAPI Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
2422 2422
2423/** 2423/**
2424 * Creates a pipe with more parameters. 2424 * Creates a pipe with more parameters.
@@ -2435,7 +2435,7 @@ ECORE_API Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
2435 * @return A pointer to the new Ecore_Pipe object on success, else NULL. 2435 * @return A pointer to the new Ecore_Pipe object on success, else NULL.
2436 * @see ecore_pipe_add() 2436 * @see ecore_pipe_add()
2437 */ 2437 */
2438ECORE_API Ecore_Pipe *ecore_pipe_full_add(Ecore_Pipe_Cb handler, 2438EAPI Ecore_Pipe *ecore_pipe_full_add(Ecore_Pipe_Cb handler,
2439 const void *data, 2439 const void *data,
2440 int fd_read, int fd_write, 2440 int fd_read, int fd_write,
2441 Eina_Bool read_survive_fork, 2441 Eina_Bool read_survive_fork,
@@ -2447,7 +2447,7 @@ ECORE_API Ecore_Pipe *ecore_pipe_full_add(Ecore_Pipe_Cb handler,
2447 * @param p The Ecore_Pipe object to be freed. 2447 * @param p The Ecore_Pipe object to be freed.
2448 * @return The pointer to the private data 2448 * @return The pointer to the private data
2449 */ 2449 */
2450ECORE_API void *ecore_pipe_del(Ecore_Pipe *p); 2450EAPI void *ecore_pipe_del(Ecore_Pipe *p);
2451 2451
2452/** 2452/**
2453 * Writes on the file descriptor the data passed as parameter. 2453 * Writes on the file descriptor the data passed as parameter.
@@ -2457,21 +2457,21 @@ ECORE_API void *ecore_pipe_del(Ecore_Pipe *p);
2457 * @param nbytes The size of the @p buffer in bytes. 2457 * @param nbytes The size of the @p buffer in bytes.
2458 * @return @c EINA_TRUE on a successful write, @c EINA_FALSE on error. 2458 * @return @c EINA_TRUE on a successful write, @c EINA_FALSE on error.
2459 */ 2459 */
2460ECORE_API Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes); 2460EAPI Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes);
2461 2461
2462/** 2462/**
2463 * Closes the write end of an Ecore_Pipe object created with ecore_pipe_add(). 2463 * Closes the write end of an Ecore_Pipe object created with ecore_pipe_add().
2464 * 2464 *
2465 * @param p The Ecore_Pipe object. 2465 * @param p The Ecore_Pipe object.
2466 */ 2466 */
2467ECORE_API void ecore_pipe_write_close(Ecore_Pipe *p); 2467EAPI void ecore_pipe_write_close(Ecore_Pipe *p);
2468 2468
2469/** 2469/**
2470 * Closes the read end of an Ecore_Pipe object created with ecore_pipe_add(). 2470 * Closes the read end of an Ecore_Pipe object created with ecore_pipe_add().
2471 * 2471 *
2472 * @param p The Ecore_Pipe object. 2472 * @param p The Ecore_Pipe object.
2473 */ 2473 */
2474ECORE_API void ecore_pipe_read_close(Ecore_Pipe *p); 2474EAPI void ecore_pipe_read_close(Ecore_Pipe *p);
2475 2475
2476/** 2476/**
2477 * Gets the pipe read file descriptor. 2477 * Gets the pipe read file descriptor.
@@ -2479,7 +2479,7 @@ ECORE_API void ecore_pipe_read_close(Ecore_Pipe *p);
2479 * @param p The Ecore_Pipe object query. 2479 * @param p The Ecore_Pipe object query.
2480 * @return The file descriptor, or @c -1 if none 2480 * @return The file descriptor, or @c -1 if none
2481 */ 2481 */
2482ECORE_API int ecore_pipe_read_fd(Ecore_Pipe *p); 2482EAPI int ecore_pipe_read_fd(Ecore_Pipe *p);
2483 2483
2484/** 2484/**
2485 * Gets the pipe write file descriptor. 2485 * Gets the pipe write file descriptor.
@@ -2487,7 +2487,7 @@ ECORE_API int ecore_pipe_read_fd(Ecore_Pipe *p);
2487 * @param p The Ecore_Pipe object query. 2487 * @param p The Ecore_Pipe object query.
2488 * @return The file descriptor, or @c -1 if none 2488 * @return The file descriptor, or @c -1 if none
2489 */ 2489 */
2490ECORE_API int ecore_pipe_write_fd(Ecore_Pipe *p); 2490EAPI int ecore_pipe_write_fd(Ecore_Pipe *p);
2491 2491
2492/** 2492/**
2493 * Starts monitoring again the pipe for reading. See ecore_pipe_freeze() for 2493 * Starts monitoring again the pipe for reading. See ecore_pipe_freeze() for
@@ -2497,7 +2497,7 @@ ECORE_API int ecore_pipe_write_fd(Ecore_Pipe *p);
2497 * @param p The Ecore_Pipe object. 2497 * @param p The Ecore_Pipe object.
2498 * @since 1.1 2498 * @since 1.1
2499 */ 2499 */
2500ECORE_API void ecore_pipe_thaw(Ecore_Pipe *p); 2500EAPI void ecore_pipe_thaw(Ecore_Pipe *p);
2501 2501
2502/** 2502/**
2503 * Stops monitoring if necessary the pipe for reading. See ecore_pipe_thaw() 2503 * Stops monitoring if necessary the pipe for reading. See ecore_pipe_thaw()
@@ -2506,7 +2506,7 @@ ECORE_API void ecore_pipe_thaw(Ecore_Pipe *p);
2506 * @param p The Ecore_Pipe object. 2506 * @param p The Ecore_Pipe object.
2507 * @since 1.1 2507 * @since 1.1
2508 */ 2508 */
2509ECORE_API void ecore_pipe_freeze(Ecore_Pipe *p); 2509EAPI void ecore_pipe_freeze(Ecore_Pipe *p);
2510 2510
2511/** 2511/**
2512 * @brief Waits from another thread on the read side of a pipe. 2512 * @brief Waits from another thread on the read side of a pipe.
@@ -2519,7 +2519,7 @@ ECORE_API void ecore_pipe_freeze(Ecore_Pipe *p);
2519 * 2519 *
2520 * Negative value for @p wait means infite wait. 2520 * Negative value for @p wait means infite wait.
2521 */ 2521 */
2522ECORE_API int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait); 2522EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait);
2523 2523
2524/** 2524/**
2525 * @} 2525 * @}
@@ -2540,7 +2540,7 @@ ECORE_API int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait);
2540 * A call to this function will store the programs command-line arguments 2540 * A call to this function will store the programs command-line arguments
2541 * for later use by ecore_app_restart() or ecore_app_args_get(). 2541 * for later use by ecore_app_restart() or ecore_app_args_get().
2542 */ 2542 */
2543ECORE_API void ecore_app_args_set(int argc, const char **argv); 2543EAPI void ecore_app_args_set(int argc, const char **argv);
2544 2544
2545/** 2545/**
2546 * Returns the programs stored command-line arguments. 2546 * Returns the programs stored command-line arguments.
@@ -2553,7 +2553,7 @@ ECORE_API void ecore_app_args_set(int argc, const char **argv);
2553 * also if the pointer is not NULL. The values they are filled with will be the 2553 * also if the pointer is not NULL. The values they are filled with will be the
2554 * same set by ecore_app_args_set(). 2554 * same set by ecore_app_args_set().
2555 */ 2555 */
2556ECORE_API void ecore_app_args_get(int *argc, char ***argv); 2556EAPI void ecore_app_args_get(int *argc, char ***argv);
2557 2557
2558/** 2558/**
2559 * Restarts the program executable with the command-line arguments stored. 2559 * Restarts the program executable with the command-line arguments stored.
@@ -2563,7 +2563,7 @@ ECORE_API void ecore_app_args_get(int *argc, char ***argv);
2563 * an easy way for a program to restart itself for cleanup purposes, 2563 * an easy way for a program to restart itself for cleanup purposes,
2564 * configuration reasons or in the event of a crash. 2564 * configuration reasons or in the event of a crash.
2565 */ 2565 */
2566ECORE_API void ecore_app_restart(void); 2566EAPI void ecore_app_restart(void);
2567 2567
2568/** 2568/**
2569 * @brief Do not load system modules for this application. 2569 * @brief Do not load system modules for this application.
@@ -2582,7 +2582,7 @@ ECORE_API void ecore_app_restart(void);
2582 * 2582 *
2583 * @since 1.8 2583 * @since 1.8
2584 */ 2584 */
2585ECORE_API void ecore_app_no_system_modules(void); 2585EAPI void ecore_app_no_system_modules(void);
2586 2586
2587/** 2587/**
2588 * @} 2588 * @}
@@ -2642,7 +2642,7 @@ ECORE_API void ecore_app_no_system_modules(void);
2642 * 2642 *
2643 * @param amount Amount (in seconds) to adjust by 2643 * @param amount Amount (in seconds) to adjust by
2644 */ 2644 */
2645ECORE_API void ecore_throttle_adjust(double amount); 2645EAPI void ecore_throttle_adjust(double amount);
2646 2646
2647/** 2647/**
2648 * Gets current throttle level. 2648 * Gets current throttle level.
@@ -2653,7 +2653,7 @@ ECORE_API void ecore_throttle_adjust(double amount);
2653 * 2653 *
2654 * @return The current throttle level. 2654 * @return The current throttle level.
2655 */ 2655 */
2656ECORE_API double ecore_throttle_get(void); 2656EAPI double ecore_throttle_get(void);
2657 2657
2658/** 2658/**
2659 * @} 2659 * @}
@@ -2796,7 +2796,7 @@ typedef enum
2796 * 2796 *
2797 * @note The default @p frametime value is 1/60th of a second. 2797 * @note The default @p frametime value is 1/60th of a second.
2798 */ 2798 */
2799ECORE_API void ecore_animator_frametime_set(double frametime); 2799EAPI void ecore_animator_frametime_set(double frametime);
2800 2800
2801/** 2801/**
2802 * @brief Gets the animator call interval in seconds. 2802 * @brief Gets the animator call interval in seconds.
@@ -2807,7 +2807,7 @@ ECORE_API void ecore_animator_frametime_set(double frametime);
2807 * 2807 *
2808 * @see ecore_animator_frametime_set() 2808 * @see ecore_animator_frametime_set()
2809 */ 2809 */
2810ECORE_API double ecore_animator_frametime_get(void); 2810EAPI double ecore_animator_frametime_get(void);
2811 2811
2812/** 2812/**
2813 * @brief Maps an input position from 0.0 to 1.0 along a timeline to a 2813 * @brief Maps an input position from 0.0 to 1.0 along a timeline to a
@@ -2869,7 +2869,7 @@ ECORE_API double ecore_animator_frametime_get(void);
2869 * 2869 *
2870 * @since 1.1.0 2870 * @since 1.1.0
2871 */ 2871 */
2872ECORE_API double ecore_animator_pos_map(double pos, Ecore_Pos_Map map, double v1, double v2); 2872EAPI double ecore_animator_pos_map(double pos, Ecore_Pos_Map map, double v1, double v2);
2873 2873
2874/** 2874/**
2875 * @brief Maps an input position from 0.0 to 1.0 along a timeline to a 2875 * @brief Maps an input position from 0.0 to 1.0 along a timeline to a
@@ -2933,7 +2933,7 @@ ECORE_API double ecore_animator_pos_map(double pos, Ecore_Pos_Map map, double v1
2933 * 2933 *
2934 * @see Ecore_Pos_Map 2934 * @see Ecore_Pos_Map
2935 */ 2935 */
2936ECORE_API double ecore_animator_pos_map_n(double pos, Ecore_Pos_Map map, int v_size, double *v); 2936EAPI double ecore_animator_pos_map_n(double pos, Ecore_Pos_Map map, int v_size, double *v);
2937 2937
2938/** 2938/**
2939 * @brief Sets the source of animator ticks for the mainloop. 2939 * @brief Sets the source of animator ticks for the mainloop.
@@ -2959,7 +2959,7 @@ ECORE_API double ecore_animator_pos_map_n(double pos, Ecore_Pos_Map map, int v_s
2959 * 2959 *
2960 * @see ecore_animator_source_get() 2960 * @see ecore_animator_source_get()
2961 */ 2961 */
2962ECORE_API void ecore_animator_source_set(Ecore_Animator_Source source); 2962EAPI void ecore_animator_source_set(Ecore_Animator_Source source);
2963 2963
2964/** 2964/**
2965 * @brief Gets the animator source currently set. 2965 * @brief Gets the animator source currently set.
@@ -2970,7 +2970,7 @@ ECORE_API void ecore_animator_source_set(Ecore_Animator_Source source);
2970 * 2970 *
2971 * @see ecore_animator_source_set() 2971 * @see ecore_animator_source_set()
2972 */ 2972 */
2973ECORE_API Ecore_Animator_Source ecore_animator_source_get(void); 2973EAPI Ecore_Animator_Source ecore_animator_source_get(void);
2974 2974
2975/** 2975/**
2976 * @brief Sets the function that begins a custom animator tick source. 2976 * @brief Sets the function that begins a custom animator tick source.
@@ -2993,7 +2993,7 @@ ECORE_API Ecore_Animator_Source ecore_animator_source_get(void);
2993 * @see ecore_animator_custom_source_tick_end_callback_set() 2993 * @see ecore_animator_custom_source_tick_end_callback_set()
2994 * @see ecore_animator_custom_tick() 2994 * @see ecore_animator_custom_tick()
2995 */ 2995 */
2996ECORE_API void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, const void *data); 2996EAPI void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, const void *data);
2997 2997
2998/** 2998/**
2999 * @brief Sets the function that ends a custom animator tick source. 2999 * @brief Sets the function that ends a custom animator tick source.
@@ -3013,7 +3013,7 @@ ECORE_API void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb fun
3013 * @see ecore_animator_custom_source_tick_begin_callback_set() 3013 * @see ecore_animator_custom_source_tick_begin_callback_set()
3014 * @see ecore_animator_custom_tick() 3014 * @see ecore_animator_custom_tick()
3015 */ 3015 */
3016ECORE_API void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, const void *data); 3016EAPI void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, const void *data);
3017 3017
3018/** 3018/**
3019 * @brief Triggers a custom animator tick. 3019 * @brief Triggers a custom animator tick.
@@ -3030,7 +3030,7 @@ ECORE_API void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func,
3030 * @see ecore_animator_custom_source_tick_begin_callback_set 3030 * @see ecore_animator_custom_source_tick_begin_callback_set
3031 * @see ecore_animator_custom_source_tick_end_callback_set()() 3031 * @see ecore_animator_custom_source_tick_end_callback_set()()
3032 */ 3032 */
3033ECORE_API void ecore_animator_custom_tick(void); 3033EAPI void ecore_animator_custom_tick(void);
3034 3034
3035/** 3035/**
3036 * @} 3036 * @}
@@ -3071,7 +3071,7 @@ typedef Eo Ecore_Timer; /**< A handle for timers */
3071 * @return Current precision. 3071 * @return Current precision.
3072 * @see ecore_timer_precision_set() 3072 * @see ecore_timer_precision_set()
3073 */ 3073 */
3074ECORE_API double ecore_timer_precision_get(void); 3074EAPI double ecore_timer_precision_get(void);
3075 3075
3076/** 3076/**
3077 * @brief Sets the precision to be used by timer infrastructure. 3077 * @brief Sets the precision to be used by timer infrastructure.
@@ -3098,7 +3098,7 @@ ECORE_API double ecore_timer_precision_get(void);
3098 * precision range, if it does not, in our example if no second timer 3098 * precision range, if it does not, in our example if no second timer
3099 * in (T + precision) existed, then it would use the minimum timeout. 3099 * in (T + precision) existed, then it would use the minimum timeout.
3100 */ 3100 */
3101ECORE_API void ecore_timer_precision_set(double precision); 3101EAPI void ecore_timer_precision_set(double precision);
3102 3102
3103/** 3103/**
3104 * This function returns a human readable text-based log for Ecore_Timer events. 3104 * This function returns a human readable text-based log for Ecore_Timer events.
@@ -3109,7 +3109,7 @@ ECORE_API void ecore_timer_precision_set(double precision);
3109 * It only contains an useful implementation if EFL is built in debug build 3109 * It only contains an useful implementation if EFL is built in debug build
3110 * profile, but it's safe to call it for any build profile. 3110 * profile, but it's safe to call it for any build profile.
3111 */ 3111 */
3112ECORE_API char *ecore_timer_dump(void); 3112EAPI char *ecore_timer_dump(void);
3113 3113
3114/** 3114/**
3115 * @} 3115 * @}
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index bf38c8617a..90a0cc38e5 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -45,9 +45,9 @@
45/* To be deprecated at some point */ 45/* To be deprecated at some point */
46 46
47/** Please use efl_provider_register instead. */ 47/** Please use efl_provider_register instead. */
48ECORE_API Eina_Bool efl_loop_register(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider); 48EAPI Eina_Bool efl_loop_register(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider);
49/** Please use efl_provider_unregister instead. */ 49/** Please use efl_provider_unregister instead. */
50ECORE_API Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider); 50EAPI Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider);
51 51
52/** 52/**
53 * @brief Quits the main loop once all the events currently on the queue have 53 * @brief Quits the main loop once all the events currently on the queue have
@@ -59,9 +59,9 @@ ECORE_API Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, c
59 * 59 *
60 * @ingroup Efl_Loop 60 * @ingroup Efl_Loop
61 */ 61 */
62ECORE_API void efl_exit(int exit_code); 62EAPI void efl_exit(int exit_code);
63 63
64ECORE_API int efl_loop_exit_code_process(Eina_Value *value); 64EAPI int efl_loop_exit_code_process(Eina_Value *value);
65 65
66#include "efl_loop_consumer.eo.h" 66#include "efl_loop_consumer.eo.h"
67 67
@@ -71,7 +71,7 @@ ECORE_API int efl_loop_exit_code_process(Eina_Value *value);
71 * @param[in] obj An object which is either a loop or a loop consumer 71 * @param[in] obj An object which is either a loop or a loop consumer
72 * @return The current loop's future scheduler. 72 * @return The current loop's future scheduler.
73 */ 73 */
74ECORE_API Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj); 74EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj);
75 75
76#include "efl_loop_fd.eo.h" 76#include "efl_loop_fd.eo.h"
77#include "efl_loop_handler.eo.h" 77#include "efl_loop_handler.eo.h"
@@ -86,7 +86,7 @@ ECORE_API Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj);
86#include "efl_cubic_bezier_interpolator.eo.h" 86#include "efl_cubic_bezier_interpolator.eo.h"
87 87
88/* We ue the factory pattern here, so you shouldn't call eo_add directly. */ 88/* We ue the factory pattern here, so you shouldn't call eo_add directly. */
89ECORE_API Eo *efl_main_loop_get(void); 89EAPI Eo *efl_main_loop_get(void);
90 90
91/** 91/**
92 * @} 92 * @}
diff --git a/src/lib/ecore/Ecore_Getopt.h b/src/lib/ecore/Ecore_Getopt.h
index c7729d2832..751d30c788 100644
--- a/src/lib/ecore/Ecore_Getopt.h
+++ b/src/lib/ecore/Ecore_Getopt.h
@@ -3,7 +3,32 @@
3 3
4#include <stdio.h> 4#include <stdio.h>
5#include <Eina.h> 5#include <Eina.h>
6#include <ecore_api.h> 6
7#ifdef EAPI
8# undef EAPI
9#endif
10
11#ifdef _WIN32
12# ifdef EFL_BUILD
13# ifdef DLL_EXPORT
14# define EAPI __declspec(dllexport)
15# else
16# define EAPI
17# endif
18# else
19# define EAPI __declspec(dllimport)
20# endif
21#else
22# ifdef __GNUC__
23# if __GNUC__ >= 4
24# define EAPI __attribute__ ((visibility("default")))
25# else
26# define EAPI
27# endif
28# else
29# define EAPI
30# endif
31#endif
7 32
8/** 33/**
9 * @ingroup Ecore 34 * @ingroup Ecore
@@ -1000,7 +1025,7 @@ struct _Ecore_Getopt
1000 * 1025 *
1001 * @see ecore_getopt_help_category() 1026 * @see ecore_getopt_help_category()
1002 */ 1027 */
1003ECORE_API void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info); 1028EAPI void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info);
1004 1029
1005/** 1030/**
1006 * Shows help for a single category (along with program usage and description). 1031 * Shows help for a single category (along with program usage and description).
@@ -1013,7 +1038,7 @@ ECORE_API void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info);
1013 * 1038 *
1014 * @see ecore_getopt_help() 1039 * @see ecore_getopt_help()
1015 */ 1040 */
1016ECORE_API Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *info, const char *category); 1041EAPI Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *info, const char *category);
1017 1042
1018/** 1043/**
1019 * Checks parser for duplicate entries, print them out. 1044 * Checks parser for duplicate entries, print them out.
@@ -1021,7 +1046,7 @@ ECORE_API Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *in
1021 * @return @c EINA_TRUE if there are duplicates, @c EINA_FALSE otherwise. 1046 * @return @c EINA_TRUE if there are duplicates, @c EINA_FALSE otherwise.
1022 * @param parser The parser to be checked. 1047 * @param parser The parser to be checked.
1023 */ 1048 */
1024ECORE_API Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser); 1049EAPI Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser);
1025 1050
1026/** 1051/**
1027 * Parses command line parameters. 1052 * Parses command line parameters.
@@ -1085,7 +1110,7 @@ ECORE_API Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *pars
1085 * 1110 *
1086 * @see ecore_getopt_parse_positional() 1111 * @see ecore_getopt_parse_positional()
1087 */ 1112 */
1088ECORE_API int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv); 1113EAPI int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv);
1089 1114
1090/** 1115/**
1091 * Parses command line positional parameters. 1116 * Parses command line positional parameters.
@@ -1138,7 +1163,7 @@ ECORE_API int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt
1138 * last positional argument is of action @c 1163 * last positional argument is of action @c
1139 * ECORE_GETOPT_ACTION_APPEND then it will be the same as @a argc. 1164 * ECORE_GETOPT_ACTION_APPEND then it will be the same as @a argc.
1140 */ 1165 */
1141ECORE_API int ecore_getopt_parse_positional(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int start); 1166EAPI int ecore_getopt_parse_positional(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int start);
1142 1167
1143 1168
1144/** 1169/**
@@ -1147,7 +1172,7 @@ ECORE_API int ecore_getopt_parse_positional(const Ecore_Getopt *parser, E
1147 * @param list Pointer to list to be freed. 1172 * @param list Pointer to list to be freed.
1148 * @return always @c NULL, so you can easily make your list head @c NULL. 1173 * @return always @c NULL, so you can easily make your list head @c NULL.
1149 */ 1174 */
1150ECORE_API Eina_List *ecore_getopt_list_free(Eina_List *list); 1175EAPI Eina_List *ecore_getopt_list_free(Eina_List *list);
1151 1176
1152/** 1177/**
1153 * Helper ecore_getopt callback to parse geometry (x:y:w:h). 1178 * Helper ecore_getopt callback to parse geometry (x:y:w:h).
@@ -1164,7 +1189,7 @@ ECORE_API Eina_List *ecore_getopt_list_free(Eina_List *list);
1164 * 1189 *
1165 * @c callback_data value is ignored, you can safely use @c NULL. 1190 * @c callback_data value is ignored, you can safely use @c NULL.
1166 */ 1191 */
1167ECORE_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); 1192EAPI 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);
1168 1193
1169/** 1194/**
1170 * Helper ecore_getopt callback to parse geometry size (WxH). 1195 * Helper ecore_getopt callback to parse geometry size (WxH).
@@ -1180,7 +1205,7 @@ ECORE_API Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *pa
1180 * 1205 *
1181 * @c callback_data value is ignored, you can safely use @c NULL. 1206 * @c callback_data value is ignored, you can safely use @c NULL.
1182 */ 1207 */
1183ECORE_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); 1208EAPI 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);
1184 1209
1185#ifdef __cplusplus 1210#ifdef __cplusplus
1186} 1211}
@@ -1190,4 +1215,7 @@ ECORE_API Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser
1190 * @} 1215 * @}
1191 */ 1216 */
1192 1217
1218#undef EAPI
1219#define EAPI
1220
1193#endif /* _ECORE_GETOPT_H */ 1221#endif /* _ECORE_GETOPT_H */
diff --git a/src/lib/ecore/Ecore_Legacy.h b/src/lib/ecore/Ecore_Legacy.h
index dbb7181b6c..e4ed2773c1 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;
38 * @c 0 it will be deleted automatically making any references/handles for it 38 * @c 0 it will be deleted automatically making any references/handles for it
39 * invalid. 39 * invalid.
40 */ 40 */
41ECORE_API Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data); 41EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
42 42
43/** 43/**
44 * @brief Deletes the specified poller from the timer list. 44 * @brief Deletes the specified poller from the timer list.
@@ -49,7 +49,7 @@ ECORE_API Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, E
49 * @note @a poller must be a valid handle. If the poller function has already 49 * @note @a poller must be a valid handle. If the poller function has already
50 * returned @c 0, the handle is no longer valid (and does not need to be deleted). 50 * returned @c 0, the handle is no longer valid (and does not need to be deleted).
51 */ 51 */
52ECORE_API void *ecore_poller_del(Ecore_Poller *poller); 52EAPI void *ecore_poller_del(Ecore_Poller *poller);
53 53
54/** 54/**
55 * @brief Sets the time(in seconds) between ticks for the given poller type. 55 * @brief Sets the time(in seconds) between ticks for the given poller type.
@@ -59,7 +59,7 @@ ECORE_API void *ecore_poller_del(Ecore_Poller *poller);
59 * This will adjust the time between ticks of the given timer type defined by 59 * This will adjust the time between ticks of the given timer type defined by
60 * @p type to the time period defined by @p poll_time. 60 * @p type to the time period defined by @p poll_time.
61 */ 61 */
62ECORE_API void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time); 62EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time);
63 63
64/** 64/**
65 * @brief Gets the time(in seconds) between ticks for the given poller type. 65 * @brief Gets the time(in seconds) between ticks for the given poller type.
@@ -68,7 +68,7 @@ ECORE_API void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double pol
68 * 68 *
69 * This will get the time between ticks of the specified poller timer. 69 * This will get the time between ticks of the specified poller timer.
70 */ 70 */
71ECORE_API double ecore_poller_poll_interval_get(Ecore_Poller_Type type); 71EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
72 72
73/** 73/**
74 * @brief Polling interval rate of the poller. 74 * @brief Polling interval rate of the poller.
@@ -77,14 +77,14 @@ ECORE_API double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
77 * 77 *
78 * @return @c true on success, @c false on failure. 78 * @return @c true on success, @c false on failure.
79 */ 79 */
80ECORE_API Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *obj, int interval); 80EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *obj, int interval);
81 81
82/** 82/**
83 * @brief Polling interval rate of the poller. 83 * @brief Polling interval rate of the poller.
84 * 84 *
85 * @return The tick interval; must be a power of 2 and <= 32768. 85 * @return The tick interval; must be a power of 2 and <= 32768.
86 */ 86 */
87ECORE_API int ecore_poller_poller_interval_get(const Ecore_Poller *obj); 87EAPI int ecore_poller_poller_interval_get(const Ecore_Poller *obj);
88 88
89/** 89/**
90 * @} 90 * @}
@@ -125,7 +125,7 @@ typedef struct _Ecore_Animator Ecore_Animator;
125 * @note The default @p frametime value is 1/30th of a second. 125 * @note The default @p frametime value is 1/30th of a second.
126 * 126 *
127 */ 127 */
128ECORE_API Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data); 128EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data);
129 129
130/** 130/**
131 * @brief Adds an animator that runs for a limited time. 131 * @brief Adds an animator that runs for a limited time.
@@ -157,7 +157,7 @@ ECORE_API Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *dat
157 * 157 *
158 * @since 1.1.0 158 * @since 1.1.0
159 */ 159 */
160ECORE_API Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data); 160EAPI Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data);
161 161
162/** 162/**
163 * @brief Deletes the specified animator from the animator list. 163 * @brief Deletes the specified animator from the animator list.
@@ -172,7 +172,7 @@ ECORE_API Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Time
172 * is invalid and should not be used again. It will not get called again after 172 * is invalid and should not be used again. It will not get called again after
173 * deletion. 173 * deletion.
174 */ 174 */
175ECORE_API void *ecore_animator_del(Ecore_Animator *animator); 175EAPI void *ecore_animator_del(Ecore_Animator *animator);
176 176
177/** 177/**
178 * @brief Suspends the specified animator. 178 * @brief Suspends the specified animator.
@@ -188,7 +188,7 @@ ECORE_API void *ecore_animator_del(Ecore_Animator *animator);
188 * will increase as if the animator hadn't been frozen and the animator may 188 * will increase as if the animator hadn't been frozen and the animator may
189 * have it's execution halted if @p runtime elapsed. 189 * have it's execution halted if @p runtime elapsed.
190 */ 190 */
191ECORE_API void ecore_animator_freeze(Ecore_Animator *animator); 191EAPI void ecore_animator_freeze(Ecore_Animator *animator);
192 192
193/** 193/**
194 * @brief Restores execution of the specified animator. 194 * @brief Restores execution of the specified animator.
@@ -198,7 +198,7 @@ ECORE_API void ecore_animator_freeze(Ecore_Animator *animator);
198 * The specified @p animator will be put back in the set of animators that are 198 * The specified @p animator will be put back in the set of animators that are
199 * executed during main loop. 199 * executed during main loop.
200 */ 200 */
201ECORE_API void ecore_animator_thaw(Ecore_Animator *animator); 201EAPI void ecore_animator_thaw(Ecore_Animator *animator);
202 202
203/** 203/**
204 * @} 204 * @}
@@ -228,7 +228,7 @@ ECORE_API void ecore_animator_thaw(Ecore_Animator *animator);
228 * @c 0 it will be deleted automatically making any references/handles for it 228 * @c 0 it will be deleted automatically making any references/handles for it
229 * invalid. 229 * invalid.
230 */ 230 */
231ECORE_API Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data); 231EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
232 232
233/** 233/**
234 * Creates a timer to call the given function in the given period of time. 234 * Creates a timer to call the given function in the given period of time.
@@ -242,7 +242,7 @@ ECORE_API Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void
242 * ecore_loop_time_get() not ecore_time_get() as ecore_timer_add() uses. See 242 * ecore_loop_time_get() not ecore_time_get() as ecore_timer_add() uses. See
243 * ecore_timer_add() for more details. 243 * ecore_timer_add() for more details.
244 */ 244 */
245ECORE_API Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data); 245EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
246 246
247/** 247/**
248 * Deletes the specified timer from the timer list. 248 * Deletes the specified timer from the timer list.
@@ -253,7 +253,7 @@ ECORE_API Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const
253 * Note: @p timer must be a valid handle. If the timer function has already 253 * Note: @p timer must be a valid handle. If the timer function has already
254 * returned @c 0, the handle is no longer valid (and does not need to be delete). 254 * returned @c 0, the handle is no longer valid (and does not need to be delete).
255 */ 255 */
256ECORE_API void *ecore_timer_del(Ecore_Timer *timer); 256EAPI void *ecore_timer_del(Ecore_Timer *timer);
257 257
258/** 258/**
259 * Pauses a running timer. 259 * Pauses a running timer.
@@ -269,7 +269,7 @@ ECORE_API void *ecore_timer_del(Ecore_Timer *timer);
269 * 269 *
270 * @see ecore_timer_thaw() 270 * @see ecore_timer_thaw()
271 */ 271 */
272ECORE_API void ecore_timer_freeze(Ecore_Timer *timer); 272EAPI void ecore_timer_freeze(Ecore_Timer *timer);
273 273
274/** 274/**
275 * @brief Return whether the timer is freezing. 275 * @brief Return whether the timer is freezing.
@@ -278,7 +278,7 @@ ECORE_API void ecore_timer_freeze(Ecore_Timer *timer);
278 * 278 *
279 * @see ecore_timer_freeze(), ecore_timer_thaw() 279 * @see ecore_timer_freeze(), ecore_timer_thaw()
280 */ 280 */
281ECORE_API Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer); 281EAPI Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer);
282 282
283/** 283/**
284 * @brief Resumes a frozen (paused) timer. 284 * @brief Resumes a frozen (paused) timer.
@@ -293,7 +293,7 @@ ECORE_API Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer);
293 * 293 *
294 * @see ecore_timer_freeze() 294 * @see ecore_timer_freeze()
295 */ 295 */
296ECORE_API void ecore_timer_thaw(Ecore_Timer *timer); 296EAPI void ecore_timer_thaw(Ecore_Timer *timer);
297 297
298#include "efl_loop_timer_eo.legacy.h" 298#include "efl_loop_timer_eo.legacy.h"
299 299
@@ -321,7 +321,7 @@ ECORE_API void ecore_timer_thaw(Ecore_Timer *timer);
321 * 321 *
322 * Idlers are useful for progressively processing data without blocking. 322 * Idlers are useful for progressively processing data without blocking.
323 */ 323 */
324ECORE_API Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data); 324EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
325 325
326/** 326/**
327 * Deletes an idler callback from the list to be executed. 327 * Deletes an idler callback from the list to be executed.
@@ -329,7 +329,7 @@ ECORE_API Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
329 * @return The data pointer passed to the idler callback on success, @c NULL 329 * @return The data pointer passed to the idler callback on success, @c NULL
330 * otherwise. 330 * otherwise.
331 */ 331 */
332ECORE_API void *ecore_idler_del(Ecore_Idler *idler); 332EAPI void *ecore_idler_del(Ecore_Idler *idler);
333 333
334/** 334/**
335 * Adds an idle enterer handler. 335 * Adds an idle enterer handler.
@@ -341,7 +341,7 @@ ECORE_API void *ecore_idler_del(Ecore_Idler *idler);
341 * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0 341 * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0
342 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle enterer. 342 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle enterer.
343 */ 343 */
344ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data); 344EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
345 345
346/** 346/**
347 * Adds an idle enterer handler at the start of the list so it gets called earlier than others. 347 * Adds an idle enterer handler at the start of the list so it gets called earlier than others.
@@ -353,7 +353,7 @@ ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const v
353 * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0 353 * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0
354 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle enterer. 354 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle enterer.
355 */ 355 */
356ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data); 356EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
357 357
358/** 358/**
359 * Deletes an idle enterer callback. 359 * Deletes an idle enterer callback.
@@ -361,7 +361,7 @@ ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func,
361 * @return The data pointer passed to the idler enterer callback on success. 361 * @return The data pointer passed to the idler enterer callback on success.
362 * @c NULL otherwise. 362 * @c NULL otherwise.
363 */ 363 */
364ECORE_API void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer); 364EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
365 365
366/** 366/**
367 * Adds an idle exiter handler. 367 * Adds an idle exiter handler.
@@ -372,7 +372,7 @@ ECORE_API void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
372 * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0 372 * idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0
373 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle exiter. 373 * (or @c ECORE_CALLBACK_CANCEL) deletes the idle exiter.
374 */ 374 */
375ECORE_API Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data); 375EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
376 376
377/** 377/**
378 * Deletes an idle exiter handler from the list to be run on exiting idle state. 378 * Deletes an idle exiter handler from the list to be run on exiting idle state.
@@ -380,7 +380,7 @@ ECORE_API Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const voi
380 * @return The data pointer that was being being passed to the handler if 380 * @return The data pointer that was being being passed to the handler if
381 * successful. @c NULL otherwise. 381 * successful. @c NULL otherwise.
382 */ 382 */
383ECORE_API void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter); 383EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
384 384
385/** 385/**
386 * @} 386 * @}
@@ -412,22 +412,22 @@ ECORE_API void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
412 * added to the queue. 412 * added to the queue.
413 * @note Once the job has been executed, the job handle is invalid. 413 * @note Once the job has been executed, the job handle is invalid.
414 */ 414 */
415ECORE_API Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data); 415EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
416 416
417/** 417/**
418 * Deletes a queued job that has not yet been executed. 418 * Deletes a queued job that has not yet been executed.
419 * @param obj Handle of the job to delete. 419 * @param obj Handle of the job to delete.
420 * @return The data pointer that was to be passed to the job. 420 * @return The data pointer that was to be passed to the job.
421 */ 421 */
422ECORE_API void *ecore_job_del(Ecore_Job *obj); 422EAPI void *ecore_job_del(Ecore_Job *obj);
423 423
424/** 424/**
425 * @} 425 * @}
426 */ 426 */
427 427
428#ifdef EFL_BETA_API_SUPPORT 428#ifdef EFL_BETA_API_SUPPORT
429ECORE_API Ecore_Animator *ecore_evas_animator_timeline_add(void *evo, double runtime, Ecore_Timeline_Cb func, const void *data); 429EAPI Ecore_Animator *ecore_evas_animator_timeline_add(void *evo, double runtime, Ecore_Timeline_Cb func, const void *data);
430ECORE_API Ecore_Animator *ecore_evas_animator_add(void *evo, Ecore_Task_Cb func, const void *data); 430EAPI Ecore_Animator *ecore_evas_animator_add(void *evo, Ecore_Task_Cb func, const void *data);
431#endif /* EFL_BETA_API_SUPPORT */ 431#endif /* EFL_BETA_API_SUPPORT */
432 432
433#endif 433#endif
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
index fb53c47512..7e80819b83 100644
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@@ -6,8 +6,31 @@
6#include <Eina.h> 6#include <Eina.h>
7#include <Eo.h> 7#include <Eo.h>
8#include <Efl.h> 8#include <Efl.h>
9#ifdef EAPI
10# undef EAPI
11#endif
9 12
10#include "ecore_api.h" 13#ifdef _WIN32
14# ifdef EFL_BUILD
15# ifdef DLL_EXPORT
16# define EAPI __declspec(dllexport)
17# else
18# define EAPI
19# endif
20# else
21# define EAPI __declspec(dllimport)
22# endif
23#else
24# ifdef __GNUC__
25# if __GNUC__ >= 4
26# define EAPI __attribute__ ((visibility("default")))
27# else
28# define EAPI
29# endif
30# else
31# define EAPI
32# endif
33#endif
11 34
12#ifdef _WIN32 35#ifdef _WIN32
13# define WIN32_LEAN_AND_MEAN 36# define WIN32_LEAN_AND_MEAN
@@ -31,7 +54,7 @@
31extern "C" { 54extern "C" {
32#endif 55#endif
33 56
34ECORE_API extern double _efl_startup_time; 57EAPI extern double _efl_startup_time;
35 58
36#include "Ecore_Common.h" 59#include "Ecore_Common.h"
37#include "Ecore_Eo.h" 60#include "Ecore_Eo.h"
@@ -40,6 +63,9 @@ ECORE_API extern double _efl_startup_time;
40} 63}
41#endif 64#endif
42 65
66#undef EAPI
67#define EAPI
68
43#endif 69#endif
44 70
45// We are including efl_general.h again, just in case Efl_Core.h was already included before this 71// 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 5868b65b07..73c17accb5 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -41,9 +41,9 @@
41#endif 41#endif
42 42
43static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV }; 43static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV };
44ECORE_API Ecore_Version *ecore_version = &_version; 44EAPI Ecore_Version *ecore_version = &_version;
45 45
46ECORE_API double _efl_startup_time = 0; 46EAPI double _efl_startup_time = 0;
47 47
48#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2) 48#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
49# define KEEP_MAX(Global, Local) \ 49# define KEEP_MAX(Global, Local) \
@@ -220,13 +220,13 @@ _efl_first_loop_iterate(void *data, const Efl_Event *event)
220 _efl_first_loop_iterate, data); 220 _efl_first_loop_iterate, data);
221} 221}
222 222
223ECORE_API void 223EAPI void
224ecore_app_no_system_modules(void) 224ecore_app_no_system_modules(void)
225{ 225{
226 _no_system_modules = EINA_TRUE; 226 _no_system_modules = EINA_TRUE;
227} 227}
228 228
229ECORE_API int 229EAPI int
230ecore_init(void) 230ecore_init(void)
231{ 231{
232 if (++_ecore_init_count != 1) 232 if (++_ecore_init_count != 1)
@@ -367,7 +367,7 @@ shutdown_evil:
367 return --_ecore_init_count; 367 return --_ecore_init_count;
368} 368}
369 369
370ECORE_API int 370EAPI int
371ecore_shutdown(void) 371ecore_shutdown(void)
372{ 372{
373 Ecore_Pipe *p; 373 Ecore_Pipe *p;
@@ -481,7 +481,7 @@ ecore_shutdown(void)
481 481
482static unsigned int _ecore_init_ex = 0; 482static unsigned int _ecore_init_ex = 0;
483 483
484ECORE_API unsigned int 484EAPI unsigned int
485ecore_init_ex(int argc, char **argv) 485ecore_init_ex(int argc, char **argv)
486{ 486{
487 if (_ecore_init_ex++ != 0) return _ecore_init_ex; 487 if (_ecore_init_ex++ != 0) return _ecore_init_ex;
@@ -494,7 +494,7 @@ ecore_init_ex(int argc, char **argv)
494 return _ecore_init_ex; 494 return _ecore_init_ex;
495} 495}
496 496
497ECORE_API unsigned int 497EAPI unsigned int
498ecore_shutdown_ex(void) 498ecore_shutdown_ex(void)
499{ 499{
500 if (--_ecore_init_ex != 0) return _ecore_init_ex; 500 if (--_ecore_init_ex != 0) return _ecore_init_ex;
@@ -516,7 +516,7 @@ typedef struct _Ecore_Fork_Cb Ecore_Fork_Cb;
516static int fork_cbs_walking = 0; 516static int fork_cbs_walking = 0;
517static Eina_List *fork_cbs = NULL; 517static Eina_List *fork_cbs = NULL;
518 518
519ECORE_API Eina_Bool 519EAPI Eina_Bool
520ecore_fork_reset_callback_add(Ecore_Cb func, const void *data) 520ecore_fork_reset_callback_add(Ecore_Cb func, const void *data)
521{ 521{
522 Ecore_Fork_Cb *fcb; 522 Ecore_Fork_Cb *fcb;
@@ -530,7 +530,7 @@ ecore_fork_reset_callback_add(Ecore_Cb func, const void *data)
530 return EINA_TRUE; 530 return EINA_TRUE;
531} 531}
532 532
533ECORE_API Eina_Bool 533EAPI Eina_Bool
534ecore_fork_reset_callback_del(Ecore_Cb func, const void *data) 534ecore_fork_reset_callback_del(Ecore_Cb func, const void *data)
535{ 535{
536 Eina_List *l; 536 Eina_List *l;
@@ -553,7 +553,7 @@ ecore_fork_reset_callback_del(Ecore_Cb func, const void *data)
553 return EINA_FALSE; 553 return EINA_FALSE;
554} 554}
555 555
556ECORE_API void 556EAPI void
557ecore_fork_reset(void) 557ecore_fork_reset(void)
558{ 558{
559 Eina_List *l, *ln; 559 Eina_List *l, *ln;
@@ -608,7 +608,7 @@ ecore_fork_reset(void)
608#endif 608#endif
609} 609}
610 610
611ECORE_API void 611EAPI void
612ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, 612ecore_main_loop_thread_safe_call_async(Ecore_Cb callback,
613 void *data) 613 void *data)
614{ 614{
@@ -633,7 +633,7 @@ ecore_main_loop_thread_safe_call_async(Ecore_Cb callback,
633 _ecore_main_loop_thread_safe_call(order); 633 _ecore_main_loop_thread_safe_call(order);
634} 634}
635 635
636ECORE_API void * 636EAPI void *
637ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, 637ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback,
638 void *data) 638 void *data)
639{ 639{
@@ -673,7 +673,7 @@ ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback,
673 return ret; 673 return ret;
674} 674}
675 675
676ECORE_API void 676EAPI void
677ecore_main_loop_thread_safe_call_wait(double wait) 677ecore_main_loop_thread_safe_call_wait(double wait)
678{ 678{
679 ecore_pipe_wait(_thread_call, 1, wait); 679 ecore_pipe_wait(_thread_call, 1, wait);
@@ -681,7 +681,7 @@ ecore_main_loop_thread_safe_call_wait(double wait)
681 681
682static Efl_Id_Domain _ecore_main_domain = EFL_ID_DOMAIN_INVALID; 682static Efl_Id_Domain _ecore_main_domain = EFL_ID_DOMAIN_INVALID;
683 683
684ECORE_API int 684EAPI int
685ecore_thread_main_loop_begin(void) 685ecore_thread_main_loop_begin(void)
686{ 686{
687 Ecore_Safe_Call *order; 687 Ecore_Safe_Call *order;
@@ -731,7 +731,7 @@ ecore_thread_main_loop_begin(void)
731 return _thread_loop; 731 return _thread_loop;
732} 732}
733 733
734ECORE_API int 734EAPI int
735ecore_thread_main_loop_end(void) 735ecore_thread_main_loop_end(void)
736{ 736{
737 int current_id; 737 int current_id;
@@ -774,7 +774,7 @@ ecore_thread_main_loop_end(void)
774 return 0; 774 return 0;
775} 775}
776 776
777ECORE_API void 777EAPI void
778ecore_print_warning(const char *function EINA_UNUSED, 778ecore_print_warning(const char *function EINA_UNUSED,
779 const char *sparam EINA_UNUSED) 779 const char *sparam EINA_UNUSED)
780{ 780{
@@ -787,7 +787,7 @@ ecore_print_warning(const char *function EINA_UNUSED,
787 if (getenv("ECORE_ERROR_ABORT")) abort(); 787 if (getenv("ECORE_ERROR_ABORT")) abort();
788} 788}
789 789
790ECORE_API void 790EAPI void
791_ecore_magic_fail(const void *d, 791_ecore_magic_fail(const void *d,
792 Ecore_Magic m, 792 Ecore_Magic m,
793 Ecore_Magic req_m, 793 Ecore_Magic req_m,
@@ -1123,13 +1123,13 @@ _thread_callback(void *data EINA_UNUSED,
1123 _ecore_main_call_flush(); 1123 _ecore_main_call_flush();
1124} 1124}
1125 1125
1126ECORE_API Ecore_Power_State 1126EAPI Ecore_Power_State
1127ecore_power_state_get(void) 1127ecore_power_state_get(void)
1128{ 1128{
1129 return _ecore_power_state; 1129 return _ecore_power_state;
1130} 1130}
1131 1131
1132ECORE_API void 1132EAPI void
1133ecore_power_state_set(Ecore_Power_State state) 1133ecore_power_state_set(Ecore_Power_State state)
1134{ 1134{
1135 if (_ecore_power_state == state) return; 1135 if (_ecore_power_state == state) return;
@@ -1137,13 +1137,13 @@ ecore_power_state_set(Ecore_Power_State state)
1137 ecore_event_add(ECORE_EVENT_POWER_STATE, NULL, NULL, NULL); 1137 ecore_event_add(ECORE_EVENT_POWER_STATE, NULL, NULL, NULL);
1138} 1138}
1139 1139
1140ECORE_API Ecore_Memory_State 1140EAPI Ecore_Memory_State
1141ecore_memory_state_get(void) 1141ecore_memory_state_get(void)
1142{ 1142{
1143 return _ecore_memory_state; 1143 return _ecore_memory_state;
1144} 1144}
1145 1145
1146ECORE_API void 1146EAPI void
1147ecore_memory_state_set(Ecore_Memory_State state) 1147ecore_memory_state_set(Ecore_Memory_State state)
1148{ 1148{
1149 if (_ecore_memory_state == state) return; 1149 if (_ecore_memory_state == state) return;
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 4e9e5644f4..61e0e95558 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -532,14 +532,14 @@ _ecore_animator_add(Ecore_Task_Cb func,
532 return animator; 532 return animator;
533} 533}
534 534
535ECORE_API Ecore_Animator * 535EAPI Ecore_Animator *
536ecore_animator_add(Ecore_Task_Cb func, 536ecore_animator_add(Ecore_Task_Cb func,
537 const void *data) 537 const void *data)
538{ 538{
539 return _ecore_animator_add(func, data); 539 return _ecore_animator_add(func, data);
540} 540}
541 541
542ECORE_API Ecore_Animator * 542EAPI Ecore_Animator *
543ecore_animator_timeline_add(double runtime, 543ecore_animator_timeline_add(double runtime,
544 Ecore_Timeline_Cb func, 544 Ecore_Timeline_Cb func,
545 const void *data) 545 const void *data)
@@ -745,7 +745,7 @@ _pos_map_cubic_bezier(double pos,
745#define SUB(A, B) eina_f32p32_sub(A, B) 745#define SUB(A, B) eina_f32p32_sub(A, B)
746#define MUL(A, B) eina_f32p32_mul(A, B) 746#define MUL(A, B) eina_f32p32_mul(A, B)
747 747
748ECORE_API double 748EAPI double
749ecore_animator_pos_map_n(double pos, 749ecore_animator_pos_map_n(double pos,
750 Ecore_Pos_Map map, 750 Ecore_Pos_Map map,
751 int v_size, 751 int v_size,
@@ -828,7 +828,7 @@ ecore_animator_pos_map_n(double pos,
828 return pos; 828 return pos;
829} 829}
830 830
831ECORE_API double 831EAPI double
832ecore_animator_pos_map(double pos, 832ecore_animator_pos_map(double pos,
833 Ecore_Pos_Map map, 833 Ecore_Pos_Map map,
834 double v1, 834 double v1,
@@ -841,7 +841,7 @@ ecore_animator_pos_map(double pos,
841 return ecore_animator_pos_map_n(pos, map, 2, v); 841 return ecore_animator_pos_map_n(pos, map, 2, v);
842} 842}
843 843
844ECORE_API void * 844EAPI void *
845ecore_animator_del(Ecore_Animator *animator) 845ecore_animator_del(Ecore_Animator *animator)
846{ 846{
847 void *data = NULL; 847 void *data = NULL;
@@ -869,7 +869,7 @@ ecore_animator_del(Ecore_Animator *animator)
869 return data; 869 return data;
870} 870}
871 871
872ECORE_API void 872EAPI void
873ecore_animator_frametime_set(double frametime) 873ecore_animator_frametime_set(double frametime)
874{ 874{
875 EINA_MAIN_LOOP_CHECK_RETURN; 875 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -880,14 +880,14 @@ ecore_animator_frametime_set(double frametime)
880 if (_have_animators()) _begin_tick(); 880 if (_have_animators()) _begin_tick();
881} 881}
882 882
883ECORE_API double 883EAPI double
884ecore_animator_frametime_get(void) 884ecore_animator_frametime_get(void)
885{ 885{
886 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0); 886 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0);
887 return animators_frametime; 887 return animators_frametime;
888} 888}
889 889
890ECORE_API void 890EAPI void
891ecore_animator_freeze(Ecore_Animator *animator) 891ecore_animator_freeze(Ecore_Animator *animator)
892{ 892{
893 EINA_MAIN_LOOP_CHECK_RETURN; 893 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -905,7 +905,7 @@ ecore_animator_freeze(Ecore_Animator *animator)
905 if (!_have_animators()) _end_tick(); 905 if (!_have_animators()) _end_tick();
906} 906}
907 907
908ECORE_API void 908EAPI void
909ecore_animator_thaw(Ecore_Animator *animator) 909ecore_animator_thaw(Ecore_Animator *animator)
910{ 910{
911 EINA_MAIN_LOOP_CHECK_RETURN; 911 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -923,7 +923,7 @@ ecore_animator_thaw(Ecore_Animator *animator)
923 if (_have_animators()) _begin_tick(); 923 if (_have_animators()) _begin_tick();
924} 924}
925 925
926ECORE_API void 926EAPI void
927ecore_animator_source_set(Ecore_Animator_Source source) 927ecore_animator_source_set(Ecore_Animator_Source source)
928{ 928{
929 EINA_MAIN_LOOP_CHECK_RETURN; 929 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -936,14 +936,14 @@ ecore_animator_source_set(Ecore_Animator_Source source)
936 if (_have_animators()) _begin_tick(); 936 if (_have_animators()) _begin_tick();
937} 937}
938 938
939ECORE_API Ecore_Animator_Source 939EAPI Ecore_Animator_Source
940ecore_animator_source_get(void) 940ecore_animator_source_get(void)
941{ 941{
942 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); 942 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
943 return src; 943 return src;
944} 944}
945 945
946ECORE_API void 946EAPI void
947ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, 947ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func,
948 const void *data) 948 const void *data)
949{ 949{
@@ -954,7 +954,7 @@ ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func,
954 if (_have_animators()) _begin_tick(); 954 if (_have_animators()) _begin_tick();
955} 955}
956 956
957ECORE_API void 957EAPI void
958ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, 958ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func,
959 const void *data) 959 const void *data)
960{ 960{
@@ -965,7 +965,7 @@ ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func,
965 if (_have_animators()) _begin_tick(); 965 if (_have_animators()) _begin_tick();
966} 966}
967 967
968ECORE_API void 968EAPI void
969ecore_animator_custom_tick(void) 969ecore_animator_custom_tick(void)
970{ 970{
971 EINA_MAIN_LOOP_CHECK_RETURN; 971 EINA_MAIN_LOOP_CHECK_RETURN;
diff --git a/src/lib/ecore/ecore_api.h b/src/lib/ecore/ecore_api.h
deleted file mode 100644
index 6a18d39514..0000000000
--- a/src/lib/ecore/ecore_api.h
+++ /dev/null
@@ -1,32 +0,0 @@
1#ifndef _EFL_CORE_API_H
2#define _EFL_CORE_API_H
3
4#ifdef ECORE_API
5#error ECORE_API should not be already defined
6#endif
7
8#ifdef _WIN32
9# ifndef ECORE_STATIC
10# ifdef ECORE_BUILD
11# define ECORE_API __declspec(dllexport)
12# else
13# define ECORE_API __declspec(dllimport)
14# endif
15# else
16# define ECORE_API
17# endif
18# define ECORE_API_WEAK
19#elif defined(__GNUC__)
20# if __GNUC__ >= 4
21# define ECORE_API __attribute__ ((visibility("default")))
22# define ECORE_API_WEAK __attribute__ ((weak))
23# else
24# define ECORE_API
25# define ECORE_API_WEAK
26# endif
27#else
28# define ECORE_API
29# define ECORE_API_WEAK
30#endif
31
32#endif
diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index df5d78751a..605f046534 100644
--- a/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
@@ -11,7 +11,7 @@
11static int app_argc = 0; 11static int app_argc = 0;
12static char **app_argv = NULL; 12static char **app_argv = NULL;
13 13
14ECORE_API void 14EAPI void
15ecore_app_args_set(int argc, 15ecore_app_args_set(int argc,
16 const char **argv) 16 const char **argv)
17{ 17{
@@ -25,7 +25,7 @@ ecore_app_args_set(int argc,
25 app_argv = (char **)argv; 25 app_argv = (char **)argv;
26} 26}
27 27
28ECORE_API void 28EAPI void
29ecore_app_args_get(int *argc, 29ecore_app_args_get(int *argc,
30 char ***argv) 30 char ***argv)
31{ 31{
@@ -35,7 +35,7 @@ ecore_app_args_get(int *argc,
35 if (argv) *argv = app_argv; 35 if (argv) *argv = app_argv;
36} 36}
37 37
38ECORE_API void 38EAPI void
39ecore_app_restart(void) 39ecore_app_restart(void)
40{ 40{
41 EINA_MAIN_LOOP_CHECK_RETURN; 41 EINA_MAIN_LOOP_CHECK_RETURN;
diff --git a/src/lib/ecore/ecore_events.c b/src/lib/ecore/ecore_events.c
index 917382f3b1..b0a6607d6a 100644
--- a/src/lib/ecore/ecore_events.c
+++ b/src/lib/ecore/ecore_events.c
@@ -9,7 +9,7 @@
9 9
10static Ecore_Event_Message_Handler *_event_msg_handler = NULL; 10static Ecore_Event_Message_Handler *_event_msg_handler = NULL;
11 11
12ECORE_API Ecore_Event_Handler * 12EAPI Ecore_Event_Handler *
13ecore_event_handler_add(int type, 13ecore_event_handler_add(int type,
14 Ecore_Event_Handler_Cb func, 14 Ecore_Event_Handler_Cb func,
15 const void *data) 15 const void *data)
@@ -18,7 +18,7 @@ ecore_event_handler_add(int type,
18 type, func, (void *)data); 18 type, func, (void *)data);
19} 19}
20 20
21ECORE_API Ecore_Event_Handler * 21EAPI Ecore_Event_Handler *
22ecore_event_handler_prepend(int type, 22ecore_event_handler_prepend(int type,
23 Ecore_Event_Handler_Cb func, 23 Ecore_Event_Handler_Cb func,
24 const void *data) 24 const void *data)
@@ -27,20 +27,20 @@ ecore_event_handler_prepend(int type,
27 type, func, (void *)data); 27 type, func, (void *)data);
28} 28}
29 29
30ECORE_API void * 30EAPI void *
31ecore_event_handler_del(Ecore_Event_Handler *event_handler) 31ecore_event_handler_del(Ecore_Event_Handler *event_handler)
32{ 32{
33 return ecore_event_message_handler_del(_event_msg_handler, 33 return ecore_event_message_handler_del(_event_msg_handler,
34 event_handler); 34 event_handler);
35} 35}
36 36
37ECORE_API void * 37EAPI void *
38ecore_event_handler_data_get(Ecore_Event_Handler *eh) 38ecore_event_handler_data_get(Ecore_Event_Handler *eh)
39{ 39{
40 return ecore_event_message_handler_data_get(_event_msg_handler, eh); 40 return ecore_event_message_handler_data_get(_event_msg_handler, eh);
41} 41}
42 42
43ECORE_API void * 43EAPI void *
44ecore_event_handler_data_set(Ecore_Event_Handler *eh, 44ecore_event_handler_data_set(Ecore_Event_Handler *eh,
45 const void *data) 45 const void *data)
46{ 46{
@@ -48,7 +48,7 @@ ecore_event_handler_data_set(Ecore_Event_Handler *eh,
48 (void *)data); 48 (void *)data);
49} 49}
50 50
51ECORE_API Ecore_Event * 51EAPI Ecore_Event *
52ecore_event_add(int type, 52ecore_event_add(int type,
53 void *ev, 53 void *ev,
54 Ecore_End_Cb func_free, 54 Ecore_End_Cb func_free,
@@ -66,7 +66,7 @@ ecore_event_add(int type,
66 return (Ecore_Event *)msg; 66 return (Ecore_Event *)msg;
67} 67}
68 68
69ECORE_API void * 69EAPI void *
70ecore_event_del(Ecore_Event *event) 70ecore_event_del(Ecore_Event *event)
71{ 71{
72 void *data = NULL; 72 void *data = NULL;
@@ -76,13 +76,13 @@ ecore_event_del(Ecore_Event *event)
76 return data; 76 return data;
77} 77}
78 78
79ECORE_API int 79EAPI int
80ecore_event_type_new(void) 80ecore_event_type_new(void)
81{ 81{
82 return ecore_event_message_handler_type_new(_event_msg_handler); 82 return ecore_event_message_handler_type_new(_event_msg_handler);
83} 83}
84 84
85ECORE_API Ecore_Event_Filter * 85EAPI Ecore_Event_Filter *
86ecore_event_filter_add(Ecore_Data_Cb func_start, 86ecore_event_filter_add(Ecore_Data_Cb func_start,
87 Ecore_Filter_Cb func_filter, 87 Ecore_Filter_Cb func_filter,
88 Ecore_End_Cb func_end, 88 Ecore_End_Cb func_end,
@@ -93,19 +93,19 @@ ecore_event_filter_add(Ecore_Data_Cb func_start,
93 func_end, (void *)data); 93 func_end, (void *)data);
94} 94}
95 95
96ECORE_API void * 96EAPI void *
97ecore_event_filter_del(Ecore_Event_Filter *ef) 97ecore_event_filter_del(Ecore_Event_Filter *ef)
98{ 98{
99 return ecore_event_message_handler_filter_del(_event_msg_handler, ef); 99 return ecore_event_message_handler_filter_del(_event_msg_handler, ef);
100} 100}
101 101
102ECORE_API int 102EAPI int
103ecore_event_current_type_get(void) 103ecore_event_current_type_get(void)
104{ 104{
105 return ecore_event_message_handler_current_type_get(_event_msg_handler); 105 return ecore_event_message_handler_current_type_get(_event_msg_handler);
106} 106}
107 107
108ECORE_API void * 108EAPI void *
109ecore_event_current_event_get(void) 109ecore_event_current_event_get(void)
110{ 110{
111 return ecore_event_message_handler_current_event_get(_event_msg_handler); 111 return ecore_event_message_handler_current_event_get(_event_msg_handler);
@@ -192,7 +192,7 @@ _ecore_event_signal_realtime_new(void)
192 return calloc(1, sizeof(Ecore_Event_Signal_Realtime)); 192 return calloc(1, sizeof(Ecore_Event_Signal_Realtime));
193} 193}
194 194
195ECORE_API void 195EAPI void
196ecore_event_type_flush_internal(int type, ...) 196ecore_event_type_flush_internal(int type, ...)
197{ 197{
198 va_list args; 198 va_list args;
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index f0b974fb06..9bd1dece31 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -33,26 +33,26 @@ struct _ecore_exe_dead_exe
33 char *cmd; 33 char *cmd;
34}; 34};
35 35
36ECORE_API int ECORE_EXE_EVENT_ADD = 0; 36EAPI int ECORE_EXE_EVENT_ADD = 0;
37ECORE_API int ECORE_EXE_EVENT_DEL = 0; 37EAPI int ECORE_EXE_EVENT_DEL = 0;
38ECORE_API int ECORE_EXE_EVENT_DATA = 0; 38EAPI int ECORE_EXE_EVENT_DATA = 0;
39ECORE_API int ECORE_EXE_EVENT_ERROR = 0; 39EAPI int ECORE_EXE_EVENT_ERROR = 0;
40 40
41ECORE_API void 41EAPI void
42ecore_exe_run_priority_set(int pri) 42ecore_exe_run_priority_set(int pri)
43{ 43{
44 EINA_MAIN_LOOP_CHECK_RETURN; 44 EINA_MAIN_LOOP_CHECK_RETURN;
45 _impl_ecore_exe_run_priority_set(pri); 45 _impl_ecore_exe_run_priority_set(pri);
46} 46}
47 47
48ECORE_API int 48EAPI int
49ecore_exe_run_priority_get(void) 49ecore_exe_run_priority_get(void)
50{ 50{
51 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); 51 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
52 return _impl_ecore_exe_run_priority_get(); 52 return _impl_ecore_exe_run_priority_get();
53} 53}
54 54
55ECORE_API Ecore_Exe * 55EAPI Ecore_Exe *
56ecore_exe_run(const char *exe_cmd, 56ecore_exe_run(const char *exe_cmd,
57 const void *data) 57 const void *data)
58{ 58{
@@ -60,7 +60,7 @@ ecore_exe_run(const char *exe_cmd,
60 return ecore_exe_pipe_run(exe_cmd, 0, data); 60 return ecore_exe_pipe_run(exe_cmd, 0, data);
61} 61}
62 62
63ECORE_API Ecore_Exe * 63EAPI Ecore_Exe *
64ecore_exe_pipe_run(const char *exe_cmd, 64ecore_exe_pipe_run(const char *exe_cmd,
65 Ecore_Exe_Flags flags, 65 Ecore_Exe_Flags flags,
66 const void *data) 66 const void *data)
@@ -101,7 +101,7 @@ _ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
101 return _impl_ecore_exe_efl_object_finalize(obj, exe); 101 return _impl_ecore_exe_efl_object_finalize(obj, exe);
102} 102}
103 103
104ECORE_API void 104EAPI void
105ecore_exe_callback_pre_free_set(Ecore_Exe *obj, 105ecore_exe_callback_pre_free_set(Ecore_Exe *obj,
106 Ecore_Exe_Cb func) 106 Ecore_Exe_Cb func)
107{ 107{
@@ -111,7 +111,7 @@ ecore_exe_callback_pre_free_set(Ecore_Exe *obj,
111 exe->pre_free_cb = func; 111 exe->pre_free_cb = func;
112} 112}
113 113
114ECORE_API Eina_Bool 114EAPI Eina_Bool
115ecore_exe_send(Ecore_Exe *obj, 115ecore_exe_send(Ecore_Exe *obj,
116 const void *data, 116 const void *data,
117 int size) 117 int size)
@@ -130,7 +130,7 @@ ecore_exe_send(Ecore_Exe *obj,
130 return _impl_ecore_exe_send(obj, exe, data, size); 130 return _impl_ecore_exe_send(obj, exe, data, size);
131} 131}
132 132
133ECORE_API void 133EAPI void
134ecore_exe_close_stdin(Ecore_Exe *obj) 134ecore_exe_close_stdin(Ecore_Exe *obj)
135{ 135{
136 EINA_MAIN_LOOP_CHECK_RETURN; 136 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -139,7 +139,7 @@ ecore_exe_close_stdin(Ecore_Exe *obj)
139 exe->close_stdin = 1; 139 exe->close_stdin = 1;
140} 140}
141 141
142ECORE_API void 142EAPI void
143ecore_exe_auto_limits_set(Ecore_Exe *obj, 143ecore_exe_auto_limits_set(Ecore_Exe *obj,
144 int start_bytes, 144 int start_bytes,
145 int end_bytes, 145 int end_bytes,
@@ -153,7 +153,7 @@ ecore_exe_auto_limits_set(Ecore_Exe *obj,
153 start_lines, end_lines); 153 start_lines, end_lines);
154} 154}
155 155
156ECORE_API Ecore_Exe_Event_Data * 156EAPI Ecore_Exe_Event_Data *
157ecore_exe_event_data_get(Ecore_Exe *obj, 157ecore_exe_event_data_get(Ecore_Exe *obj,
158 Ecore_Exe_Flags flags) 158 Ecore_Exe_Flags flags)
159{ 159{
@@ -163,7 +163,7 @@ ecore_exe_event_data_get(Ecore_Exe *obj,
163 return _impl_ecore_exe_event_data_get(obj, exe, flags); 163 return _impl_ecore_exe_event_data_get(obj, exe, flags);
164} 164}
165 165
166ECORE_API void 166EAPI void
167ecore_exe_tag_set(Ecore_Exe *obj, 167ecore_exe_tag_set(Ecore_Exe *obj,
168 const char *tag) 168 const char *tag)
169{ 169{
@@ -175,7 +175,7 @@ ecore_exe_tag_set(Ecore_Exe *obj,
175 else exe->tag = NULL; 175 else exe->tag = NULL;
176} 176}
177 177
178ECORE_API const char * 178EAPI const char *
179ecore_exe_tag_get(const Ecore_Exe *obj) 179ecore_exe_tag_get(const Ecore_Exe *obj)
180{ 180{
181 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 181 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
@@ -184,7 +184,7 @@ ecore_exe_tag_get(const Ecore_Exe *obj)
184 return exe->tag; 184 return exe->tag;
185} 185}
186 186
187ECORE_API void * 187EAPI void *
188ecore_exe_free(Ecore_Exe *obj) 188ecore_exe_free(Ecore_Exe *obj)
189{ 189{
190 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 190 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
@@ -202,7 +202,7 @@ _ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
202 _impl_ecore_exe_efl_object_destructor(obj, exe); 202 _impl_ecore_exe_efl_object_destructor(obj, exe);
203} 203}
204 204
205ECORE_API void 205EAPI void
206ecore_exe_event_data_free(Ecore_Exe_Event_Data *e) 206ecore_exe_event_data_free(Ecore_Exe_Event_Data *e)
207{ 207{
208 if (!e) return; 208 if (!e) return;
@@ -211,7 +211,7 @@ ecore_exe_event_data_free(Ecore_Exe_Event_Data *e)
211 free(e); 211 free(e);
212} 212}
213 213
214ECORE_API pid_t 214EAPI pid_t
215ecore_exe_pid_get(const Ecore_Exe *obj) 215ecore_exe_pid_get(const Ecore_Exe *obj)
216{ 216{
217 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); 217 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
@@ -220,7 +220,7 @@ ecore_exe_pid_get(const Ecore_Exe *obj)
220 return exe->pid; 220 return exe->pid;
221} 221}
222 222
223ECORE_API const char * 223EAPI const char *
224ecore_exe_cmd_get(const Ecore_Exe *obj) 224ecore_exe_cmd_get(const Ecore_Exe *obj)
225{ 225{
226 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 226 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
@@ -229,7 +229,7 @@ ecore_exe_cmd_get(const Ecore_Exe *obj)
229 return ret; 229 return ret;
230} 230}
231 231
232ECORE_API void * 232EAPI void *
233ecore_exe_data_get(const Ecore_Exe *obj) 233ecore_exe_data_get(const Ecore_Exe *obj)
234{ 234{
235 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 235 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
@@ -238,7 +238,7 @@ ecore_exe_data_get(const Ecore_Exe *obj)
238 return exe->data; 238 return exe->data;
239} 239}
240 240
241ECORE_API void * 241EAPI void *
242ecore_exe_data_set(Ecore_Exe *obj, 242ecore_exe_data_set(Ecore_Exe *obj,
243 void *data) 243 void *data)
244{ 244{
@@ -251,7 +251,7 @@ ecore_exe_data_set(Ecore_Exe *obj,
251 return ret; 251 return ret;
252} 252}
253 253
254ECORE_API Ecore_Exe_Flags 254EAPI Ecore_Exe_Flags
255ecore_exe_flags_get(const Ecore_Exe *obj) 255ecore_exe_flags_get(const Ecore_Exe *obj)
256{ 256{
257 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); 257 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
@@ -260,13 +260,13 @@ ecore_exe_flags_get(const Ecore_Exe *obj)
260 return exe->flags; 260 return exe->flags;
261} 261}
262 262
263ECORE_API void 263EAPI void
264ecore_exe_pause(Ecore_Exe *obj) 264ecore_exe_pause(Ecore_Exe *obj)
265{ 265{
266 efl_control_suspend_set(obj, EINA_TRUE); 266 efl_control_suspend_set(obj, EINA_TRUE);
267} 267}
268 268
269ECORE_API void 269EAPI void
270ecore_exe_continue(Ecore_Exe *obj) 270ecore_exe_continue(Ecore_Exe *obj)
271{ 271{
272 efl_control_suspend_set(obj, EINA_FALSE); 272 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
280 else _impl_ecore_exe_continue(obj, exe); 280 else _impl_ecore_exe_continue(obj, exe);
281} 281}
282 282
283ECORE_API void 283EAPI void
284ecore_exe_interrupt(Ecore_Exe *obj) 284ecore_exe_interrupt(Ecore_Exe *obj)
285{ 285{
286 EINA_MAIN_LOOP_CHECK_RETURN; 286 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -289,7 +289,7 @@ ecore_exe_interrupt(Ecore_Exe *obj)
289 _impl_ecore_exe_interrupt(obj, exe); 289 _impl_ecore_exe_interrupt(obj, exe);
290} 290}
291 291
292ECORE_API void 292EAPI void
293ecore_exe_quit(Ecore_Exe *obj) 293ecore_exe_quit(Ecore_Exe *obj)
294{ 294{
295 EINA_MAIN_LOOP_CHECK_RETURN; 295 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -298,7 +298,7 @@ ecore_exe_quit(Ecore_Exe *obj)
298 _impl_ecore_exe_quit(obj, exe); 298 _impl_ecore_exe_quit(obj, exe);
299} 299}
300 300
301ECORE_API void 301EAPI void
302ecore_exe_terminate(Ecore_Exe *obj) 302ecore_exe_terminate(Ecore_Exe *obj)
303{ 303{
304 EINA_MAIN_LOOP_CHECK_RETURN; 304 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -307,7 +307,7 @@ ecore_exe_terminate(Ecore_Exe *obj)
307 _impl_ecore_exe_terminate(obj, exe); 307 _impl_ecore_exe_terminate(obj, exe);
308} 308}
309 309
310ECORE_API void 310EAPI void
311ecore_exe_kill(Ecore_Exe *obj) 311ecore_exe_kill(Ecore_Exe *obj)
312{ 312{
313 EINA_MAIN_LOOP_CHECK_RETURN; 313 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -316,7 +316,7 @@ ecore_exe_kill(Ecore_Exe *obj)
316 _impl_ecore_exe_kill(obj, exe); 316 _impl_ecore_exe_kill(obj, exe);
317} 317}
318 318
319ECORE_API void 319EAPI void
320ecore_exe_signal(Ecore_Exe *obj, 320ecore_exe_signal(Ecore_Exe *obj,
321 int num) 321 int num)
322{ 322{
@@ -326,7 +326,7 @@ ecore_exe_signal(Ecore_Exe *obj,
326 _impl_ecore_exe_signal(obj, exe, num); 326 _impl_ecore_exe_signal(obj, exe, num);
327} 327}
328 328
329ECORE_API void 329EAPI void
330ecore_exe_hup(Ecore_Exe *obj) 330ecore_exe_hup(Ecore_Exe *obj)
331{ 331{
332 EINA_MAIN_LOOP_CHECK_RETURN; 332 EINA_MAIN_LOOP_CHECK_RETURN;
diff --git a/src/lib/ecore/ecore_exe_eo.c b/src/lib/ecore/ecore_exe_eo.c
index 35c5cda92e..6a1775a678 100644
--- a/src/lib/ecore/ecore_exe_eo.c
+++ b/src/lib/ecore/ecore_exe_eo.c
@@ -1,15 +1,15 @@
1ECORE_API ECORE_API_WEAK const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET = 1EWAPI const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET =
2 EFL_EVENT_DESCRIPTION("data,get"); 2 EFL_EVENT_DESCRIPTION("data,get");
3ECORE_API ECORE_API_WEAK const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR = 3EWAPI const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR =
4 EFL_EVENT_DESCRIPTION("data,error"); 4 EFL_EVENT_DESCRIPTION("data,error");
5 5
6void _ecore_exe_command_set(Eo *obj, Ecore_Exe_Data *pd, const char *exe_cmd, Ecore_Exe_Flags flags); 6void _ecore_exe_command_set(Eo *obj, Ecore_Exe_Data *pd, const char *exe_cmd, Ecore_Exe_Flags flags);
7 7
8ECORE_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); 8EOAPI EFL_VOID_FUNC_BODYV(ecore_obj_exe_command_set, EFL_FUNC_CALL(exe_cmd, flags), const char *exe_cmd, Ecore_Exe_Flags flags);
9 9
10void _ecore_exe_command_get(const Eo *obj, Ecore_Exe_Data *pd, const char **exe_cmd, Ecore_Exe_Flags *flags); 10void _ecore_exe_command_get(const Eo *obj, Ecore_Exe_Data *pd, const char **exe_cmd, Ecore_Exe_Flags *flags);
11 11
12ECORE_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); 12EOAPI EFL_VOID_FUNC_BODYV_CONST(ecore_obj_exe_command_get, EFL_FUNC_CALL(exe_cmd, flags), const char **exe_cmd, Ecore_Exe_Flags *flags);
13 13
14void _ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *pd); 14void _ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *pd);
15 15
diff --git a/src/lib/ecore/ecore_exe_eo.h b/src/lib/ecore/ecore_exe_eo.h
index 68392c51f8..a4ab65e635 100644
--- a/src/lib/ecore/ecore_exe_eo.h
+++ b/src/lib/ecore/ecore_exe_eo.h
@@ -80,7 +80,7 @@ typedef enum
80 */ 80 */
81#define ECORE_EXE_CLASS ecore_exe_class_get() 81#define ECORE_EXE_CLASS ecore_exe_class_get()
82 82
83ECORE_API ECORE_API_WEAK const Efl_Class *ecore_exe_class_get(void) EINA_CONST; 83EWAPI const Efl_Class *ecore_exe_class_get(void) EINA_CONST;
84 84
85/** 85/**
86 * @brief Controls the command that's executed. FIXME: May need a split/rename. 86 * @brief Controls the command that's executed. FIXME: May need a split/rename.
@@ -91,7 +91,7 @@ ECORE_API ECORE_API_WEAK const Efl_Class *ecore_exe_class_get(void) EINA_CONST;
91 * 91 *
92 * @ingroup Ecore_Exe 92 * @ingroup Ecore_Exe
93 */ 93 */
94ECORE_API ECORE_API_WEAK void ecore_obj_exe_command_set(Eo *obj, const char *exe_cmd, Ecore_Exe_Flags flags); 94EOAPI void ecore_obj_exe_command_set(Eo *obj, const char *exe_cmd, Ecore_Exe_Flags flags);
95 95
96/** 96/**
97 * @brief Controls the command that's executed. FIXME: May need a split/rename. 97 * @brief Controls the command that's executed. FIXME: May need a split/rename.
@@ -102,9 +102,9 @@ ECORE_API ECORE_API_WEAK void ecore_obj_exe_command_set(Eo *obj, const char *exe
102 * 102 *
103 * @ingroup Ecore_Exe 103 * @ingroup Ecore_Exe
104 */ 104 */
105ECORE_API ECORE_API_WEAK void ecore_obj_exe_command_get(const Eo *obj, const char **exe_cmd, Ecore_Exe_Flags *flags); 105EOAPI void ecore_obj_exe_command_get(const Eo *obj, const char **exe_cmd, Ecore_Exe_Flags *flags);
106 106
107ECORE_API ECORE_API_WEAK extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET; 107EWAPI extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET;
108 108
109/** Data received event from the child process 109/** Data received event from the child process
110 * @return Ecore_Exe_Event_Data 110 * @return Ecore_Exe_Event_Data
@@ -113,7 +113,7 @@ ECORE_API ECORE_API_WEAK extern const Efl_Event_Description _ECORE_EXE_EVENT_DAT
113 */ 113 */
114#define ECORE_EXE_EVENT_DATA_GET (&(_ECORE_EXE_EVENT_DATA_GET)) 114#define ECORE_EXE_EVENT_DATA_GET (&(_ECORE_EXE_EVENT_DATA_GET))
115 115
116ECORE_API ECORE_API_WEAK extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR; 116EWAPI extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR;
117 117
118/** Error received event from the child process 118/** Error received event from the child process
119 * @return Ecore_Exe_Event_Data 119 * @return Ecore_Exe_Event_Data
diff --git a/src/lib/ecore/ecore_exe_private.h b/src/lib/ecore/ecore_exe_private.h
index 88710123f5..aad66fc1da 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
133 133
134typedef struct _Ecore_Exe_Data Ecore_Exe_Data; 134typedef struct _Ecore_Exe_Data Ecore_Exe_Data;
135 135
136ECORE_API extern int ECORE_EXE_EVENT_ADD; 136EAPI extern int ECORE_EXE_EVENT_ADD;
137ECORE_API extern int ECORE_EXE_EVENT_DEL; 137EAPI extern int ECORE_EXE_EVENT_DEL;
138ECORE_API extern int ECORE_EXE_EVENT_DATA; 138EAPI extern int ECORE_EXE_EVENT_DATA;
139ECORE_API extern int ECORE_EXE_EVENT_ERROR; 139EAPI extern int ECORE_EXE_EVENT_ERROR;
140 140
141Ecore_Exe *_ecore_exe_find(pid_t pid); 141Ecore_Exe *_ecore_exe_find(pid_t pid);
142void *_ecore_exe_event_del_new(void); 142void *_ecore_exe_event_del_new(void);
diff --git a/src/lib/ecore/ecore_getopt.c b/src/lib/ecore/ecore_getopt.c
index 46d2b180c9..8dc1981ba8 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)
810 return EINA_TRUE; 810 return EINA_TRUE;
811} 811}
812 812
813ECORE_API void 813EAPI void
814ecore_getopt_help(FILE *fp, 814ecore_getopt_help(FILE *fp,
815 const Ecore_Getopt *parser) 815 const Ecore_Getopt *parser)
816{ 816{
@@ -822,7 +822,7 @@ ecore_getopt_help(FILE *fp,
822 _ecore_getopt_help_options(fp, parser); 822 _ecore_getopt_help_options(fp, parser);
823} 823}
824 824
825ECORE_API Eina_Bool 825EAPI Eina_Bool
826ecore_getopt_help_category(FILE *fp, 826ecore_getopt_help_category(FILE *fp,
827 const Ecore_Getopt *parser, 827 const Ecore_Getopt *parser,
828 const char *category) 828 const char *category)
@@ -1977,7 +1977,7 @@ _ecore_getopt_parse_find_long_other(const Ecore_Getopt *parser,
1977 return NULL; 1977 return NULL;
1978} 1978}
1979 1979
1980ECORE_API Eina_Bool 1980EAPI Eina_Bool
1981ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser) 1981ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser)
1982{ 1982{
1983 const Ecore_Getopt_Desc *desc = parser->descs; 1983 const Ecore_Getopt_Desc *desc = parser->descs;
@@ -2028,7 +2028,7 @@ _ecore_getopt_find_help(const Ecore_Getopt *parser)
2028 return NULL; 2028 return NULL;
2029} 2029}
2030 2030
2031ECORE_API int 2031EAPI int
2032ecore_getopt_parse(const Ecore_Getopt *parser, 2032ecore_getopt_parse(const Ecore_Getopt *parser,
2033 Ecore_Getopt_Value *values, 2033 Ecore_Getopt_Value *values,
2034 int argc, 2034 int argc,
@@ -2092,7 +2092,7 @@ error:
2092 return -1; 2092 return -1;
2093} 2093}
2094 2094
2095ECORE_API int 2095EAPI int
2096ecore_getopt_parse_positional(const Ecore_Getopt *parser, 2096ecore_getopt_parse_positional(const Ecore_Getopt *parser,
2097 Ecore_Getopt_Value *values, 2097 Ecore_Getopt_Value *values,
2098 int argc, 2098 int argc,
@@ -2159,7 +2159,7 @@ error:
2159 return -1; 2159 return -1;
2160} 2160}
2161 2161
2162ECORE_API Eina_List * 2162EAPI Eina_List *
2163ecore_getopt_list_free(Eina_List *list) 2163ecore_getopt_list_free(Eina_List *list)
2164{ 2164{
2165 void *data; 2165 void *data;
@@ -2169,7 +2169,7 @@ ecore_getopt_list_free(Eina_List *list)
2169 return NULL; 2169 return NULL;
2170} 2170}
2171 2171
2172ECORE_API Eina_Bool 2172EAPI Eina_Bool
2173ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser EINA_UNUSED, 2173ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser EINA_UNUSED,
2174 const Ecore_Getopt_Desc *desc EINA_UNUSED, 2174 const Ecore_Getopt_Desc *desc EINA_UNUSED,
2175 const char *str, 2175 const char *str,
@@ -2187,7 +2187,7 @@ ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser EINA_UNUSED
2187 return EINA_TRUE; 2187 return EINA_TRUE;
2188} 2188}
2189 2189
2190ECORE_API Eina_Bool 2190EAPI Eina_Bool
2191ecore_getopt_callback_size_parse(const Ecore_Getopt *parser EINA_UNUSED, 2191ecore_getopt_callback_size_parse(const Ecore_Getopt *parser EINA_UNUSED,
2192 const Ecore_Getopt_Desc *desc EINA_UNUSED, 2192 const Ecore_Getopt_Desc *desc EINA_UNUSED,
2193 const char *str, 2193 const char *str,
diff --git a/src/lib/ecore/ecore_glib.c b/src/lib/ecore/ecore_glib.c
index a914f1b3ec..8fc2c158bf 100644
--- a/src/lib/ecore/ecore_glib.c
+++ b/src/lib/ecore/ecore_glib.c
@@ -286,7 +286,7 @@ _ecore_glib_shutdown(void)
286#endif 286#endif
287} 287}
288 288
289ECORE_API Eina_Bool 289EAPI Eina_Bool
290ecore_main_loop_glib_integrate(void) 290ecore_main_loop_glib_integrate(void)
291{ 291{
292#ifdef HAVE_GLIB 292#ifdef HAVE_GLIB
@@ -310,7 +310,7 @@ ecore_main_loop_glib_integrate(void)
310 310
311Eina_Bool _ecore_glib_always_integrate = 1; 311Eina_Bool _ecore_glib_always_integrate = 1;
312 312
313ECORE_API void 313EAPI void
314ecore_main_loop_glib_always_integrate_disable(void) 314ecore_main_loop_glib_always_integrate_disable(void)
315{ 315{
316 _ecore_glib_always_integrate = 0; 316 _ecore_glib_always_integrate = 0;
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index d0268468ae..9ce4716c45 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,
14 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
16 16
17ECORE_API Ecore_Idle_Enterer * 17EAPI Ecore_Idle_Enterer *
18ecore_idle_enterer_add(Ecore_Task_Cb func, 18ecore_idle_enterer_add(Ecore_Task_Cb func,
19 const void *data) 19 const void *data)
20{ 20{
21 return _ecore_factorized_idle_add(ecore_idle_enterer_callbacks(), func, data); 21 return _ecore_factorized_idle_add(ecore_idle_enterer_callbacks(), func, data);
22} 22}
23 23
24ECORE_API Ecore_Idle_Enterer * 24EAPI Ecore_Idle_Enterer *
25ecore_idle_enterer_before_add(Ecore_Task_Cb func, 25ecore_idle_enterer_before_add(Ecore_Task_Cb func,
26 const void *data) 26 const void *data)
27{ 27{
@@ -36,7 +36,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
36 return ie; 36 return ie;
37} 37}
38 38
39ECORE_API void * 39EAPI void *
40ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer) 40ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
41{ 41{
42 return _ecore_factorized_idle_del(idle_enterer); 42 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 cb6fc75915..9ca26c8ee6 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,
13 { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process }, 13 { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process },
14 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
16ECORE_API Ecore_Idle_Exiter * 16EAPI Ecore_Idle_Exiter *
17ecore_idle_exiter_add(Ecore_Task_Cb func, 17ecore_idle_exiter_add(Ecore_Task_Cb func,
18 const void *data) 18 const void *data)
19{ 19{
20 return _ecore_factorized_idle_add(ecore_idle_exiter_callbacks(), func, data); 20 return _ecore_factorized_idle_add(ecore_idle_exiter_callbacks(), func, data);
21} 21}
22 22
23ECORE_API void * 23EAPI void *
24ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter) 24ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
25{ 25{
26 return _ecore_factorized_idle_del(idle_exiter); 26 return _ecore_factorized_idle_del(idle_exiter);
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index cf49586361..ffd4579cae 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,
105 { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process }, 105 { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process },
106 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); 106 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
107 107
108ECORE_API Ecore_Idler * 108EAPI Ecore_Idler *
109ecore_idler_add(Ecore_Task_Cb func, 109ecore_idler_add(Ecore_Task_Cb func,
110 const void *data) 110 const void *data)
111{ 111{
112 return _ecore_factorized_idle_add(ecore_idler_callbacks(), func, data); 112 return _ecore_factorized_idle_add(ecore_idler_callbacks(), func, data);
113} 113}
114 114
115ECORE_API void * 115EAPI void *
116ecore_idler_del(Ecore_Idler *idler) 116ecore_idler_del(Ecore_Idler *idler)
117{ 117{
118 return _ecore_factorized_idle_del(idler); 118 return _ecore_factorized_idle_del(idler);
diff --git a/src/lib/ecore/ecore_internal.h b/src/lib/ecore/ecore_internal.h
index 731456bf5e..9f6e55eb24 100644
--- a/src/lib/ecore/ecore_internal.h
+++ b/src/lib/ecore/ecore_internal.h
@@ -2,10 +2,34 @@
2#ifndef _ECORE_INTERNAL_H 2#ifndef _ECORE_INTERNAL_H
3#define _ECORE_INTERNAL_H 3#define _ECORE_INTERNAL_H
4 4
5#include <ecore_api.h> 5#ifdef EAPI
6# undef EAPI
7#endif
8
9#ifdef _WIN32
10# ifdef EFL_BUILD
11# ifdef DLL_EXPORT
12# define EAPI __declspec(dllexport)
13# else
14# define EAPI
15# endif
16# else
17# define EAPI __declspec(dllimport)
18# endif
19#else
20# ifdef __GNUC__
21# if __GNUC__ >= 4
22# define EAPI __attribute__ ((visibility("default")))
23# else
24# define EAPI
25# endif
26# else
27# define EAPI
28# endif
29#endif
6 30
7ECORE_API void ecore_loop_arguments_send(int argc, const char **argv); 31EAPI void ecore_loop_arguments_send(int argc, const char **argv);
8ECORE_API Eina_Bool efl_loop_message_process(Eo *obj); 32EAPI Eina_Bool efl_loop_message_process(Eo *obj);
9 33
10static inline Eina_Value 34static inline Eina_Value
11efl_model_list_value_get(Eina_List *childrens, 35efl_model_list_value_get(Eina_List *childrens,
@@ -138,4 +162,7 @@ _efl_future_all_repack(Eo *o EINA_UNUSED, void *data EINA_UNUSED, const Eina_Val
138 return eina_value_error_init(EFL_MODEL_ERROR_UNKNOWN); 162 return eina_value_error_init(EFL_MODEL_ERROR_UNKNOWN);
139} 163}
140 164
165#undef EAPI
166#define EAPI
167
141#endif 168#endif
diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c
index ae5ab5dd26..29d5412a94 100644
--- a/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
@@ -39,7 +39,7 @@ _ecore_job_shutdown(void)
39 _ecore_job_handler = NULL; 39 _ecore_job_handler = NULL;
40} 40}
41 41
42ECORE_API Ecore_Job * 42EAPI Ecore_Job *
43ecore_job_add(Ecore_Cb func, 43ecore_job_add(Ecore_Cb func,
44 const void *data) 44 const void *data)
45{ 45{
@@ -69,7 +69,7 @@ ecore_job_add(Ecore_Cb func,
69 return job; 69 return job;
70} 70}
71 71
72ECORE_API void * 72EAPI void *
73ecore_job_del(Ecore_Job *job) 73ecore_job_del(Ecore_Job *job)
74{ 74{
75 void *data; 75 void *data;
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index ea2ae669ff..a037916e3a 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -209,7 +209,7 @@ static gboolean ecore_fds_ready;
209 209
210static double _ecore_main_loop_wakeup_time = 0.0; 210static double _ecore_main_loop_wakeup_time = 0.0;
211 211
212ECORE_API double _ecore_main_loop_wakeup_time_get(void) 212EAPI double _ecore_main_loop_wakeup_time_get(void)
213{ 213{
214 return _ecore_main_loop_wakeup_time; 214 return _ecore_main_loop_wakeup_time;
215} 215}
@@ -1280,21 +1280,21 @@ _ecore_main_loop_quit(Eo *obj, Efl_Loop_Data *pd)
1280#endif 1280#endif
1281} 1281}
1282 1282
1283ECORE_API void 1283EAPI void
1284ecore_main_loop_iterate(void) 1284ecore_main_loop_iterate(void)
1285{ 1285{
1286 EINA_MAIN_LOOP_CHECK_RETURN; 1286 EINA_MAIN_LOOP_CHECK_RETURN;
1287 efl_loop_iterate(ML_OBJ); 1287 efl_loop_iterate(ML_OBJ);
1288} 1288}
1289 1289
1290ECORE_API int 1290EAPI int
1291ecore_main_loop_iterate_may_block(int may_block) 1291ecore_main_loop_iterate_may_block(int may_block)
1292{ 1292{
1293 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); 1293 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
1294 return efl_loop_iterate_may_block(ML_OBJ, may_block); 1294 return efl_loop_iterate_may_block(ML_OBJ, may_block);
1295} 1295}
1296 1296
1297ECORE_API void 1297EAPI void
1298ecore_main_loop_begin(void) 1298ecore_main_loop_begin(void)
1299{ 1299{
1300 DBG("ecore_main_loop_begin"); 1300 DBG("ecore_main_loop_begin");
@@ -1304,7 +1304,7 @@ ecore_main_loop_begin(void)
1304 eina_evlog("-mainloop", NULL, 0.0, NULL); 1304 eina_evlog("-mainloop", NULL, 0.0, NULL);
1305} 1305}
1306 1306
1307ECORE_API void 1307EAPI void
1308ecore_main_loop_quit(void) 1308ecore_main_loop_quit(void)
1309{ 1309{
1310 Eina_Value v = EINA_VALUE_EMPTY; 1310 Eina_Value v = EINA_VALUE_EMPTY;
@@ -1315,27 +1315,27 @@ ecore_main_loop_quit(void)
1315 efl_loop_quit(ML_OBJ, v); 1315 efl_loop_quit(ML_OBJ, v);
1316} 1316}
1317 1317
1318ECORE_API int 1318EAPI int
1319ecore_main_loop_nested_get(void) 1319ecore_main_loop_nested_get(void)
1320{ 1320{
1321 return in_main_loop; 1321 return in_main_loop;
1322} 1322}
1323 1323
1324ECORE_API Eina_Bool 1324EAPI Eina_Bool
1325ecore_main_loop_animator_ticked_get(void) 1325ecore_main_loop_animator_ticked_get(void)
1326{ 1326{
1327 DBG("ecore_main_loop_animator_ticked_get"); 1327 DBG("ecore_main_loop_animator_ticked_get");
1328 return _ecore_animator_run_get(); 1328 return _ecore_animator_run_get();
1329} 1329}
1330 1330
1331ECORE_API void 1331EAPI void
1332ecore_main_loop_select_func_set(Ecore_Select_Function func) 1332ecore_main_loop_select_func_set(Ecore_Select_Function func)
1333{ 1333{
1334 EINA_MAIN_LOOP_CHECK_RETURN; 1334 EINA_MAIN_LOOP_CHECK_RETURN;
1335 main_loop_select = func; 1335 main_loop_select = func;
1336} 1336}
1337 1337
1338ECORE_API Ecore_Select_Function 1338EAPI Ecore_Select_Function
1339ecore_main_loop_select_func_get(void) 1339ecore_main_loop_select_func_get(void)
1340{ 1340{
1341 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 1341 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
@@ -1432,7 +1432,7 @@ _ecore_main_fd_handler_del(Eo *obj EINA_UNUSED,
1432 return r; 1432 return r;
1433} 1433}
1434 1434
1435ECORE_API Ecore_Fd_Handler * 1435EAPI Ecore_Fd_Handler *
1436ecore_main_fd_handler_add(int fd, 1436ecore_main_fd_handler_add(int fd,
1437 Ecore_Fd_Handler_Flags flags, 1437 Ecore_Fd_Handler_Flags flags,
1438 Ecore_Fd_Cb func, 1438 Ecore_Fd_Cb func,
@@ -1449,7 +1449,7 @@ ecore_main_fd_handler_add(int fd,
1449 return fdh; 1449 return fdh;
1450} 1450}
1451 1451
1452ECORE_API Ecore_Fd_Handler * 1452EAPI Ecore_Fd_Handler *
1453ecore_main_fd_handler_file_add(int fd, 1453ecore_main_fd_handler_file_add(int fd,
1454 Ecore_Fd_Handler_Flags flags, 1454 Ecore_Fd_Handler_Flags flags,
1455 Ecore_Fd_Cb func, 1455 Ecore_Fd_Cb func,
@@ -1463,7 +1463,7 @@ ecore_main_fd_handler_file_add(int fd,
1463 buf_func, buf_data, EINA_TRUE); 1463 buf_func, buf_data, EINA_TRUE);
1464} 1464}
1465 1465
1466ECORE_API void * 1466EAPI void *
1467ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler) 1467ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler)
1468{ 1468{
1469 if (!fd_handler) return NULL; 1469 if (!fd_handler) return NULL;
@@ -1479,7 +1479,7 @@ ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler)
1479} 1479}
1480 1480
1481#ifdef _WIN32 1481#ifdef _WIN32
1482ECORE_API Ecore_Win32_Handler * 1482EAPI Ecore_Win32_Handler *
1483_ecore_main_win32_handler_add(Eo *obj, 1483_ecore_main_win32_handler_add(Eo *obj,
1484 Efl_Loop_Data *pd, 1484 Efl_Loop_Data *pd,
1485 Eo *handler, 1485 Eo *handler,
@@ -1525,7 +1525,7 @@ _ecore_main_win32_handler_del(Eo *obj EINA_UNUSED,
1525 return win32_handler->data; 1525 return win32_handler->data;
1526} 1526}
1527 1527
1528ECORE_API Ecore_Win32_Handler * 1528EAPI Ecore_Win32_Handler *
1529ecore_main_win32_handler_add(void *h, 1529ecore_main_win32_handler_add(void *h,
1530 Ecore_Win32_Handle_Cb func, 1530 Ecore_Win32_Handle_Cb func,
1531 const void *data) 1531 const void *data)
@@ -1534,7 +1534,7 @@ ecore_main_win32_handler_add(void *h,
1534 return _ecore_main_win32_handler_add(ML_OBJ, ML_DAT, NULL, h, func, data); 1534 return _ecore_main_win32_handler_add(ML_OBJ, ML_DAT, NULL, h, func, data);
1535} 1535}
1536 1536
1537ECORE_API void * 1537EAPI void *
1538ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler) 1538ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler)
1539{ 1539{
1540 void *ret = NULL; 1540 void *ret = NULL;
@@ -1551,7 +1551,7 @@ ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler)
1551 return ret; 1551 return ret;
1552} 1552}
1553#else 1553#else
1554ECORE_API Ecore_Win32_Handler * 1554EAPI Ecore_Win32_Handler *
1555_ecore_main_win32_handler_add(Eo *obj EINA_UNUSED, 1555_ecore_main_win32_handler_add(Eo *obj EINA_UNUSED,
1556 Efl_Loop_Data *pd EINA_UNUSED, 1556 Efl_Loop_Data *pd EINA_UNUSED,
1557 Eo *handler EINA_UNUSED, 1557 Eo *handler EINA_UNUSED,
@@ -1570,7 +1570,7 @@ _ecore_main_win32_handler_del(Eo *obj EINA_UNUSED,
1570 return NULL; 1570 return NULL;
1571} 1571}
1572 1572
1573ECORE_API Ecore_Win32_Handler * 1573EAPI Ecore_Win32_Handler *
1574ecore_main_win32_handler_add(void *h EINA_UNUSED, 1574ecore_main_win32_handler_add(void *h EINA_UNUSED,
1575 Ecore_Win32_Handle_Cb func EINA_UNUSED, 1575 Ecore_Win32_Handle_Cb func EINA_UNUSED,
1576 const void *data EINA_UNUSED) 1576 const void *data EINA_UNUSED)
@@ -1578,14 +1578,14 @@ ecore_main_win32_handler_add(void *h EINA_UNUSED,
1578 return NULL; 1578 return NULL;
1579} 1579}
1580 1580
1581ECORE_API void * 1581EAPI void *
1582ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler EINA_UNUSED) 1582ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler EINA_UNUSED)
1583{ 1583{
1584 return NULL; 1584 return NULL;
1585} 1585}
1586#endif 1586#endif
1587 1587
1588ECORE_API void 1588EAPI void
1589ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, 1589ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler,
1590 Ecore_Fd_Prep_Cb func, 1590 Ecore_Fd_Prep_Cb func,
1591 const void *data) 1591 const void *data)
@@ -1610,7 +1610,7 @@ ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler,
1610 (pd->fd_handlers_with_prep, fd_handler); 1610 (pd->fd_handlers_with_prep, fd_handler);
1611} 1611}
1612 1612
1613ECORE_API int 1613EAPI int
1614ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler) 1614ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler)
1615{ 1615{
1616 if (!fd_handler) return -1; 1616 if (!fd_handler) return -1;
@@ -1626,7 +1626,7 @@ ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler)
1626 return fd_handler->fd; 1626 return fd_handler->fd;
1627} 1627}
1628 1628
1629ECORE_API Eina_Bool 1629EAPI Eina_Bool
1630ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, 1630ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler,
1631 Ecore_Fd_Handler_Flags flags) 1631 Ecore_Fd_Handler_Flags flags)
1632{ 1632{
@@ -1646,7 +1646,7 @@ ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler,
1646 return ret; 1646 return ret;
1647} 1647}
1648 1648
1649ECORE_API void 1649EAPI void
1650ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, 1650ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler,
1651 Ecore_Fd_Handler_Flags flags) 1651 Ecore_Fd_Handler_Flags flags)
1652{ 1652{
diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index 73c7e661c3..e884494605 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);
89static Eina_Bool _ecore_pipe_read(void *data, 89static Eina_Bool _ecore_pipe_read(void *data,
90 Ecore_Fd_Handler *fd_handler); 90 Ecore_Fd_Handler *fd_handler);
91 91
92ECORE_API Ecore_Pipe * 92EAPI Ecore_Pipe *
93ecore_pipe_add(Ecore_Pipe_Cb handler, 93ecore_pipe_add(Ecore_Pipe_Cb handler,
94 const void *data) 94 const void *data)
95{ 95{
96 return _ecore_pipe_add(handler, data); 96 return _ecore_pipe_add(handler, data);
97} 97}
98 98
99ECORE_API void * 99EAPI void *
100ecore_pipe_del(Ecore_Pipe *p) 100ecore_pipe_del(Ecore_Pipe *p)
101{ 101{
102 if (!p) return NULL; 102 if (!p) return NULL;
@@ -104,7 +104,7 @@ ecore_pipe_del(Ecore_Pipe *p)
104 return _ecore_pipe_del(p); 104 return _ecore_pipe_del(p);
105} 105}
106 106
107ECORE_API void 107EAPI void
108ecore_pipe_read_close(Ecore_Pipe *p) 108ecore_pipe_read_close(Ecore_Pipe *p)
109{ 109{
110 EINA_MAIN_LOOP_CHECK_RETURN; 110 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -125,7 +125,7 @@ ecore_pipe_read_close(Ecore_Pipe *p)
125 } 125 }
126} 126}
127 127
128ECORE_API int 128EAPI int
129ecore_pipe_read_fd(Ecore_Pipe *p) 129ecore_pipe_read_fd(Ecore_Pipe *p)
130{ 130{
131 EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID); 131 EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID);
@@ -133,7 +133,7 @@ ecore_pipe_read_fd(Ecore_Pipe *p)
133 return p->fd_read; 133 return p->fd_read;
134} 134}
135 135
136ECORE_API void 136EAPI void
137ecore_pipe_freeze(Ecore_Pipe *p) 137ecore_pipe_freeze(Ecore_Pipe *p)
138{ 138{
139 EINA_MAIN_LOOP_CHECK_RETURN; 139 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -149,7 +149,7 @@ ecore_pipe_freeze(Ecore_Pipe *p)
149 } 149 }
150} 150}
151 151
152ECORE_API void 152EAPI void
153ecore_pipe_thaw(Ecore_Pipe *p) 153ecore_pipe_thaw(Ecore_Pipe *p)
154{ 154{
155 EINA_MAIN_LOOP_CHECK_RETURN; 155 EINA_MAIN_LOOP_CHECK_RETURN;
@@ -164,7 +164,7 @@ ecore_pipe_thaw(Ecore_Pipe *p)
164 NULL, NULL); 164 NULL, NULL);
165} 165}
166 166
167ECORE_API int 167EAPI int
168ecore_pipe_wait(Ecore_Pipe *p, 168ecore_pipe_wait(Ecore_Pipe *p,
169 int message_count, 169 int message_count,
170 double wait) 170 double wait)
@@ -172,7 +172,7 @@ ecore_pipe_wait(Ecore_Pipe *p,
172 return _ecore_pipe_wait(p, message_count, wait); 172 return _ecore_pipe_wait(p, message_count, wait);
173} 173}
174 174
175ECORE_API void 175EAPI void
176ecore_pipe_write_close(Ecore_Pipe *p) 176ecore_pipe_write_close(Ecore_Pipe *p)
177{ 177{
178 if (!ECORE_MAGIC_CHECK(p, ECORE_MAGIC_PIPE)) 178 if (!ECORE_MAGIC_CHECK(p, ECORE_MAGIC_PIPE))
@@ -187,7 +187,7 @@ ecore_pipe_write_close(Ecore_Pipe *p)
187 } 187 }
188} 188}
189 189
190ECORE_API int 190EAPI int
191ecore_pipe_write_fd(Ecore_Pipe *p) 191ecore_pipe_write_fd(Ecore_Pipe *p)
192{ 192{
193 EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID); 193 EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID);
@@ -195,7 +195,7 @@ ecore_pipe_write_fd(Ecore_Pipe *p)
195 return p->fd_write; 195 return p->fd_write;
196} 196}
197 197
198ECORE_API Eina_Bool 198EAPI Eina_Bool
199ecore_pipe_write(Ecore_Pipe *p, 199ecore_pipe_write(Ecore_Pipe *p,
200 const void *buffer, 200 const void *buffer,
201 unsigned int nbytes) 201 unsigned int nbytes)
@@ -289,7 +289,7 @@ out:
289 return ok; 289 return ok;
290} 290}
291 291
292ECORE_API Ecore_Pipe * 292EAPI Ecore_Pipe *
293ecore_pipe_full_add(Ecore_Pipe_Cb handler, 293ecore_pipe_full_add(Ecore_Pipe_Cb handler,
294 const void *data, 294 const void *data,
295 int fd_read, 295 int fd_read,
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 30554431cc..dfc9aa90b0 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)
211 return ECORE_CALLBACK_RENEW; 211 return ECORE_CALLBACK_RENEW;
212} 212}
213 213
214ECORE_API void 214EAPI void
215ecore_poller_poll_interval_set(Ecore_Poller_Type type EINA_UNUSED, 215ecore_poller_poll_interval_set(Ecore_Poller_Type type EINA_UNUSED,
216 double poll_time) 216 double poll_time)
217{ 217{
@@ -227,14 +227,14 @@ ecore_poller_poll_interval_set(Ecore_Poller_Type type EINA_UNUSED,
227 _ecore_poller_next_tick_eval(); 227 _ecore_poller_next_tick_eval();
228} 228}
229 229
230ECORE_API double 230EAPI double
231ecore_poller_poll_interval_get(Ecore_Poller_Type type EINA_UNUSED) 231ecore_poller_poll_interval_get(Ecore_Poller_Type type EINA_UNUSED)
232{ 232{
233 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0); 233 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0);
234 return poll_interval; 234 return poll_interval;
235} 235}
236 236
237ECORE_API Ecore_Poller * 237EAPI Ecore_Poller *
238ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED, 238ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
239 int interval, 239 int interval,
240 Ecore_Task_Cb func, 240 Ecore_Task_Cb func,
@@ -278,7 +278,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
278 return poller; 278 return poller;
279} 279}
280 280
281ECORE_API Eina_Bool 281EAPI Eina_Bool
282ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval) 282ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
283{ 283{
284 int ibit; 284 int ibit;
@@ -310,7 +310,7 @@ ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
310 return EINA_TRUE; 310 return EINA_TRUE;
311} 311}
312 312
313ECORE_API int 313EAPI int
314ecore_poller_poller_interval_get(const Ecore_Poller *poller) 314ecore_poller_poller_interval_get(const Ecore_Poller *poller)
315{ 315{
316 int ibit, interval = 1; 316 int ibit, interval = 1;
@@ -328,7 +328,7 @@ ecore_poller_poller_interval_get(const Ecore_Poller *poller)
328 return interval; 328 return interval;
329} 329}
330 330
331ECORE_API void * 331EAPI void *
332ecore_poller_del(Ecore_Poller *poller) 332ecore_poller_del(Ecore_Poller *poller)
333{ 333{
334 void *data; 334 void *data;
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index 5576bb99e7..f87e5e753f 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -2,7 +2,6 @@
2#define _ECORE_PRIVATE_H 2#define _ECORE_PRIVATE_H
3 3
4#include <assert.h> 4#include <assert.h>
5#include <ecore_api.h>
6 5
7#include "ecore_internal.h" 6#include "ecore_internal.h"
8 7
@@ -10,6 +9,32 @@
10#include "ecore_event_message.eo.h" 9#include "ecore_event_message.eo.h"
11#include "ecore_event_message_handler.eo.h" 10#include "ecore_event_message_handler.eo.h"
12 11
12#ifdef EAPI
13# undef EAPI
14#endif
15
16#ifdef _WIN32
17# ifdef EFL_BUILD
18# ifdef DLL_EXPORT
19# define EAPI __declspec(dllexport)
20# else
21# define EAPI
22# endif
23# else
24# define EAPI __declspec(dllimport)
25# endif
26#else
27# ifdef __GNUC__
28# if __GNUC__ >= 4
29# define EAPI __attribute__ ((visibility("default")))
30# else
31# define EAPI
32# endif
33# else
34# define EAPI
35# endif
36#endif
37
13extern int _ecore_log_dom; 38extern int _ecore_log_dom;
14#ifdef _ECORE_DEFAULT_LOG_DOM 39#ifdef _ECORE_DEFAULT_LOG_DOM
15# undef _ECORE_DEFAULT_LOG_DOM 40# undef _ECORE_DEFAULT_LOG_DOM
@@ -197,7 +222,7 @@ typedef struct _Ecore_Evas_Object_Animator_Interface
197 void *(*del)(Ecore_Animator *animator); 222 void *(*del)(Ecore_Animator *animator);
198} Ecore_Evas_Object_Animator_Interface; 223} Ecore_Evas_Object_Animator_Interface;
199 224
200ECORE_API void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interface *iface); 225EAPI void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interface *iface);
201 226
202#define EVAS_FRAME_QUEUING 1 /* for test */ 227#define EVAS_FRAME_QUEUING 1 /* for test */
203 228
@@ -222,12 +247,6 @@ ECORE_API void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interf
222typedef unsigned int Ecore_Magic; 247typedef unsigned int Ecore_Magic;
223#define ECORE_MAGIC Ecore_Magic __magic 248#define ECORE_MAGIC Ecore_Magic __magic
224 249
225ECORE_API void
226_ecore_magic_fail(const void *d,
227 Ecore_Magic m,
228 Ecore_Magic req_m,
229 const char *fname EINA_UNUSED);
230
231#define ECORE_MAGIC_SET(d, m) (d)->__magic = (m) 250#define ECORE_MAGIC_SET(d, m) (d)->__magic = (m)
232#define ECORE_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m))) 251#define ECORE_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m)))
233#define ECORE_MAGIC_FAIL(d, m, fn) _ecore_magic_fail((d), (d) ? (d)->__magic : 0, (m), (fn)); 252#define ECORE_MAGIC_FAIL(d, m, fn) _ecore_magic_fail((d), (d) ? (d)->__magic : 0, (m), (fn));
@@ -242,7 +261,7 @@ _ecore_magic_fail(const void *d,
242#undef IF_FN_DEL 261#undef IF_FN_DEL
243#define IF_FN_DEL(_fn, ptr) if (ptr) { _fn(ptr); ptr = NULL; } 262#define IF_FN_DEL(_fn, ptr) if (ptr) { _fn(ptr); ptr = NULL; }
244 263
245ECORE_API void 264EAPI void
246ecore_print_warning(const char *function, 265ecore_print_warning(const char *function,
247 const char *sparam); 266 const char *sparam);
248 267
@@ -263,7 +282,7 @@ ecore_print_warning(const char *function,
263 return; \ 282 return; \
264 } 283 }
265 284
266ECORE_API void _ecore_magic_fail(const void *d, 285EAPI void _ecore_magic_fail(const void *d,
267 Ecore_Magic m, 286 Ecore_Magic m,
268 Ecore_Magic req_m, 287 Ecore_Magic req_m,
269 const char *fname); 288 const char *fname);
@@ -538,4 +557,7 @@ extern Efl_Version _app_efl_version;
538 557
539#define EFL_LOOP_DATA efl_data_scope_get(efl_main_loop_get(), EFL_LOOP_CLASS) 558#define EFL_LOOP_DATA efl_data_scope_get(efl_main_loop_get(), EFL_LOOP_CLASS)
540 559
560#undef EAPI
561#define EAPI
562
541#endif 563#endif
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index d253a9ab5d..f38c7880c1 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -654,7 +654,7 @@ _ecore_thread_shutdown(void)
654 CDD(_ecore_thread_global_hash_cond); 654 CDD(_ecore_thread_global_hash_cond);
655} 655}
656 656
657ECORE_API Ecore_Thread * 657EAPI Ecore_Thread *
658ecore_thread_run(Ecore_Thread_Cb func_blocking, 658ecore_thread_run(Ecore_Thread_Cb func_blocking,
659 Ecore_Thread_Cb func_end, 659 Ecore_Thread_Cb func_end,
660 Ecore_Thread_Cb func_cancel, 660 Ecore_Thread_Cb func_cancel,
@@ -737,7 +737,7 @@ retry:
737 return (Ecore_Thread *)work; 737 return (Ecore_Thread *)work;
738} 738}
739 739
740ECORE_API Eina_Bool 740EAPI Eina_Bool
741ecore_thread_cancel(Ecore_Thread *thread) 741ecore_thread_cancel(Ecore_Thread *thread)
742{ 742{
743 Ecore_Pthread_Worker *volatile work = (Ecore_Pthread_Worker *)thread; 743 Ecore_Pthread_Worker *volatile work = (Ecore_Pthread_Worker *)thread;
@@ -846,7 +846,7 @@ _ecore_thread_wait_end(void *data EINA_UNUSED, Ecore_Thread *thread)
846 _ecore_thread_wait_reset(waiter, worker); 846 _ecore_thread_wait_reset(waiter, worker);
847} 847}
848 848
849ECORE_API Eina_Bool 849EAPI Eina_Bool
850ecore_thread_wait(Ecore_Thread *thread, double wait) 850ecore_thread_wait(Ecore_Thread *thread, double wait)
851{ 851{
852 Ecore_Pthread_Worker *worker = (Ecore_Pthread_Worker *)thread; 852 Ecore_Pthread_Worker *worker = (Ecore_Pthread_Worker *)thread;
@@ -888,7 +888,7 @@ ecore_thread_wait(Ecore_Thread *thread, double wait)
888 } 888 }
889} 889}
890 890
891ECORE_API Eina_Bool 891EAPI Eina_Bool
892ecore_thread_check(Ecore_Thread *thread) 892ecore_thread_check(Ecore_Thread *thread)
893{ 893{