summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertise.dev>2020-12-14 11:43:38 -0300
committerFelipe Magno de Almeida <felipe@expertise.dev>2020-12-14 11:45:35 -0300
commit4e5b01f8a03d3b01f54c3a67898f9ca67f050481 (patch)
tree2a43e3b4bcf900021db08a556968bf1bd37c1700
parenta43c2dad505dbce76b955422c41091fc5b0efc2b (diff)
eio: Rename EAPI macro to EIO_API in Eio library
Summary: Patch from a series of patches to rename EAPI symbols to specific library DSOs. = The Rationale = This patch is from a series of patches to rename EAPI symbols to specific library DSOs. EAPI was designed to be able to pass `__attribute__ ((visibility ("default")))` for symbols with GCC, which would mean that even if -fvisibility=hidden was used when compiling the library, the needed symbols would get exported. MSVC __almost__ works like GCC (or mingw) in which you can declare everything as export and it will just work (slower, but it will work). But there's a caveat: global variables will not work the same way for MSVC, but works for mingw and GCC. For global variables (as opposed to functions), MSVC requires correct DSO visibility for MSVC: instead of declaring a symbol as export for everything, you need to declare it as import when importing from another DSO and export when defining it locally. With current EAPI definitions, we get the following example working in mingw and MSVC (observe it doesn't define any global variables as exported symbols). Example 1: dll1: ``` EAPI void foo(void); EAPI void bar() { foo(); } ``` dll2: ``` EAPI void foo() { printf ("foo\n"); } ``` This works fine with API defined as __declspec(dllexport) in both cases and for gcc defining as `__atttribute__((visibility("default")))`. However, the following: Example 2: dll1: ``` EAPI extern int foo; EAPI void foobar(void); EAPI void bar() { foo = 5; foobar(); } ``` dll2: ``` EAPI int foo = 0; EAPI void foobar() { printf ("foo %d\n", foo); } ``` This will work on mingw but will not work for MSVC. And that's why LIBAPI is the only solution that works for MSVC. Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com> Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com> Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev> Reviewers: vtorri, woohyun, lucas, jptiz Reviewed By: vtorri, lucas Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12210
-rw-r--r--src/lib/eio/Eio.h46
-rw-r--r--src/lib/eio/Eio_Legacy.h130
-rw-r--r--src/lib/eio/eio_dir.c10
-rw-r--r--src/lib/eio/eio_eet.c20
-rw-r--r--src/lib/eio/eio_file.c22
-rw-r--r--src/lib/eio/eio_main.c10
-rw-r--r--src/lib/eio/eio_map.c8
-rw-r--r--src/lib/eio/eio_monitor.c34
-rw-r--r--src/lib/eio/eio_monitor_poll.c4
-rw-r--r--src/lib/eio/eio_single.c12
-rw-r--r--src/lib/eio/eio_xattr.c18
-rw-r--r--src/lib/eio/meson.build3
-rw-r--r--src/lib/elementary/elc_fileselector.c2
-rw-r--r--src/lib/elementary/elc_fileselector_button.c2
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c2
-rw-r--r--src/lib/elementary/elm_interface_fileselector.c2
16 files changed, 158 insertions, 167 deletions
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index f72529e6e0..3e90cdaf94 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -32,41 +32,34 @@
32#include <Eet.h> 32#include <Eet.h>
33#include <Efl_Config.h> 33#include <Efl_Config.h>
34 34
35#ifdef EAPI 35#ifdef EIO_API
36# undef EAPI 36#error EIO_API should not be already defined
37#endif
38
39#ifdef EAPI_WEAK
40# undef EAPI_WEAK
41#endif 37#endif
42 38
43#ifdef _WIN32 39#ifdef _WIN32
44# ifdef EFL_BUILD 40# ifndef EIO_STATIC
45# ifdef DLL_EXPORT 41# ifdef EIO_BUILD
46# define EAPI __declspec(dllexport) 42# define EIO_API __declspec(dllexport)
47# else 43# else
48# define EAPI 44# define EIO_API __declspec(dllimport)
49# endif 45# endif
50# else 46# else
51# define EAPI __declspec(dllimport) 47# define EIO_API
52# endif 48# endif
53# define EAPI_WEAK 49# define EIO_API_WEAK
54#else 50#elif defined(__GNUC__)
55# ifdef __GNUC__ 51# if __GNUC__ >= 4
56# if __GNUC__ >= 4 52# define EIO_API __attribute__ ((visibility("default")))
57# define EAPI __attribute__ ((visibility("default"))) 53# define EIO_API_WEAK __attribute__ ((weak))
58# define EAPI_WEAK __attribute__ ((weak))
59# else
60# define EAPI
61# define EAPI_WEAK
62# endif
63# else 54# else
64# define EAPI 55# define EIO_API
65# define EAPI_WEAK 56# define EIO_API_WEAK
66# endif 57# endif
58#else
59# define EIO_API
60# define EIO_API_WEAK
67#endif 61#endif
68 62
69
70#ifdef __cplusplus 63#ifdef __cplusplus
71extern "C" { 64extern "C" {
72#endif 65#endif
@@ -133,7 +126,7 @@ static inline Eina_Bool eio_file_is_lnk(const Eina_Stat *stat);
133 * @param interval The interval (in seconds) to poll 126 * @param interval The interval (in seconds) to poll
134 * @since 1.21 127 * @since 1.21
135 */ 128 */
136EAPI void eio_monitoring_interval_set(double interval); 129EIO_API void eio_monitoring_interval_set(double interval);
137 130
138#include "eio_inline_helper.x" 131#include "eio_inline_helper.x"
139 132
@@ -144,7 +137,4 @@ EAPI void eio_monitoring_interval_set(double interval);
144} 137}
145#endif 138#endif
146 139
147#undef EAPI
148#define EAPI
149
150#endif 140#endif
diff --git a/src/lib/eio/Eio_Legacy.h b/src/lib/eio/Eio_Legacy.h
index b14c1177da..e492750f72 100644
--- a/src/lib/eio/Eio_Legacy.h
+++ b/src/lib/eio/Eio_Legacy.h
@@ -18,7 +18,7 @@ extern "C" {
18 * Eio Version Information 18 * Eio Version Information
19 * @ingroup Eio 19 * @ingroup Eio
20 */ 20 */
21EAPI extern Eio_Version *eio_version; 21EIO_API extern Eio_Version *eio_version;
22 22
23/** 23/**
24 * @file 24 * @file
@@ -206,7 +206,7 @@ struct _Eio_Progress
206 * @see eio_file_direct_ls() 206 * @see eio_file_direct_ls()
207 * @see eio_file_stat_ls() 207 * @see eio_file_stat_ls()
208 */ 208 */
209EAPI Eio_File *eio_file_ls(const char *dir, 209EIO_API Eio_File *eio_file_ls(const char *dir,
210 Eio_Filter_Cb filter_cb, 210 Eio_Filter_Cb filter_cb,
211 Eio_Main_Cb main_cb, 211 Eio_Main_Cb main_cb,
212 Eio_Done_Cb done_cb, 212 Eio_Done_Cb done_cb,
@@ -241,7 +241,7 @@ EAPI Eio_File *eio_file_ls(const char *dir,
241 * @see eina_file_direct_ls() 241 * @see eina_file_direct_ls()
242 * @see ecore_thread_feedback_run() 242 * @see ecore_thread_feedback_run()
243 */ 243 */
244EAPI Eio_File *eio_file_direct_ls(const char *dir, 244EIO_API Eio_File *eio_file_direct_ls(const char *dir,
245 Eio_Filter_Direct_Cb filter_cb, 245 Eio_Filter_Direct_Cb filter_cb,
246 Eio_Main_Direct_Cb main_cb, 246 Eio_Main_Direct_Cb main_cb,
247 Eio_Done_Cb done_cb, 247 Eio_Done_Cb done_cb,
@@ -272,7 +272,7 @@ EAPI Eio_File *eio_file_direct_ls(const char *dir,
272 * @see eina_file_stat_ls() 272 * @see eina_file_stat_ls()
273 * @see ecore_thread_feedback_run() 273 * @see ecore_thread_feedback_run()
274 */ 274 */
275EAPI Eio_File *eio_file_stat_ls(const char *dir, 275EIO_API Eio_File *eio_file_stat_ls(const char *dir,
276 Eio_Filter_Direct_Cb filter_cb, 276 Eio_Filter_Direct_Cb filter_cb,
277 Eio_Main_Direct_Cb main_cb, 277 Eio_Main_Direct_Cb main_cb,
278 Eio_Done_Cb done_cb, 278 Eio_Done_Cb done_cb,
@@ -301,7 +301,7 @@ EAPI Eio_File *eio_file_stat_ls(const char *dir,
301 * @see eina_file_stat_ls() 301 * @see eina_file_stat_ls()
302 * @see ecore_thread_feedback_run() 302 * @see ecore_thread_feedback_run()
303 */ 303 */
304EAPI Eio_File *eio_dir_stat_ls(const char *dir, 304EIO_API Eio_File *eio_dir_stat_ls(const char *dir,
305 Eio_Filter_Direct_Cb filter_cb, 305 Eio_Filter_Direct_Cb filter_cb,
306 Eio_Main_Direct_Cb main_cb, 306 Eio_Main_Direct_Cb main_cb,
307 Eio_Done_Cb done_cb, 307 Eio_Done_Cb done_cb,
@@ -329,7 +329,7 @@ EAPI Eio_File *eio_dir_stat_ls(const char *dir,
329 * @see eina_file_direct_ls() 329 * @see eina_file_direct_ls()
330 * @see ecore_thread_feedback_run() 330 * @see ecore_thread_feedback_run()
331 */ 331 */
332EAPI Eio_File *eio_dir_direct_ls(const char *dir, 332EIO_API Eio_File *eio_dir_direct_ls(const char *dir,
333 Eio_Filter_Dir_Cb filter_cb, 333 Eio_Filter_Dir_Cb filter_cb,
334 Eio_Main_Direct_Cb main_cb, 334 Eio_Main_Direct_Cb main_cb,
335 Eio_Done_Cb done_cb, 335 Eio_Done_Cb done_cb,
@@ -346,7 +346,7 @@ EAPI Eio_File *eio_dir_direct_ls(const char *dir,
346 * 346 *
347 * eio_file_direct_stat calls stat in another thread. This prevents any blocking in your apps. 347 * eio_file_direct_stat calls stat in another thread. This prevents any blocking in your apps.
348 */ 348 */
349EAPI Eio_File *eio_file_direct_stat(const char *path, 349EIO_API Eio_File *eio_file_direct_stat(const char *path,
350 Eio_Stat_Cb done_cb, 350 Eio_Stat_Cb done_cb,
351 Eio_Error_Cb error_cb, 351 Eio_Error_Cb error_cb,
352 const void *data); 352 const void *data);
@@ -380,7 +380,7 @@ EAPI Eio_File *eio_file_direct_stat(const char *path,
380 * Set a new permission of a path changing it to the mode passed as argument. 380 * Set a new permission of a path changing it to the mode passed as argument.
381 * It's equivalent to the chmod command. 381 * It's equivalent to the chmod command.
382 */ 382 */
383EAPI Eio_File *eio_file_chmod(const char *path, 383EIO_API Eio_File *eio_file_chmod(const char *path,
384 mode_t mode, 384 mode_t mode,
385 Eio_Done_Cb done_cb, 385 Eio_Done_Cb done_cb,
386 Eio_Error_Cb error_cb, 386 Eio_Error_Cb error_cb,
@@ -402,7 +402,7 @@ EAPI Eio_File *eio_file_chmod(const char *path,
402 * @note Some platforms (including Windows) do not support chown(). In that 402 * @note Some platforms (including Windows) do not support chown(). In that
403 * case, this function returns @c NULL. 403 * case, this function returns @c NULL.
404 */ 404 */
405EAPI Eio_File *eio_file_chown(const char *path, 405EIO_API Eio_File *eio_file_chown(const char *path,
406 const char *user, 406 const char *user,
407 const char *group, 407 const char *group,
408 Eio_Done_Cb done_cb, 408 Eio_Done_Cb done_cb,
@@ -419,7 +419,7 @@ EAPI Eio_File *eio_file_chown(const char *path,
419 * 419 *
420 * This function will erase a file. 420 * This function will erase a file.
421 */ 421 */
422EAPI Eio_File *eio_file_unlink(const char *path, 422EIO_API Eio_File *eio_file_unlink(const char *path,
423 Eio_Done_Cb done_cb, 423 Eio_Done_Cb done_cb,
424 Eio_Error_Cb error_cb, 424 Eio_Error_Cb error_cb,
425 const void *data); 425 const void *data);
@@ -435,7 +435,7 @@ EAPI Eio_File *eio_file_unlink(const char *path,
435 * 435 *
436 * Creates a new directory using the mode provided. 436 * Creates a new directory using the mode provided.
437 */ 437 */
438EAPI Eio_File *eio_file_mkdir(const char *path, 438EIO_API Eio_File *eio_file_mkdir(const char *path,
439 mode_t mode, 439 mode_t mode,
440 Eio_Done_Cb done_cb, 440 Eio_Done_Cb done_cb,
441 Eio_Error_Cb error_cb, 441 Eio_Error_Cb error_cb,
@@ -457,7 +457,7 @@ EAPI Eio_File *eio_file_mkdir(const char *path,
457 * if possible, if not it will fallback to mmap/write. It will try to preserve 457 * if possible, if not it will fallback to mmap/write. It will try to preserve
458 * access rights, but not user/group identification. 458 * access rights, but not user/group identification.
459 */ 459 */
460EAPI Eio_File *eio_file_move(const char *source, 460EIO_API Eio_File *eio_file_move(const char *source,
461 const char *dest, 461 const char *dest,
462 Eio_Progress_Cb progress_cb, 462 Eio_Progress_Cb progress_cb,
463 Eio_Done_Cb done_cb, 463 Eio_Done_Cb done_cb,
@@ -479,7 +479,7 @@ EAPI Eio_File *eio_file_move(const char *source,
479 * if possible, if not it will fallback to mmap/write. It will try to preserve 479 * if possible, if not it will fallback to mmap/write. It will try to preserve
480 * access rights, but not user/group identification. 480 * access rights, but not user/group identification.
481 */ 481 */
482EAPI Eio_File *eio_file_copy(const char *source, 482EIO_API Eio_File *eio_file_copy(const char *source,
483 const char *dest, 483 const char *dest,
484 Eio_Progress_Cb progress_cb, 484 Eio_Progress_Cb progress_cb,
485 Eio_Done_Cb done_cb, 485 Eio_Done_Cb done_cb,
@@ -509,7 +509,7 @@ EAPI Eio_File *eio_file_copy(const char *source,
509 * 509 *
510 * @note if a rename occurs, the filter callback will not be called. 510 * @note if a rename occurs, the filter callback will not be called.
511 */ 511 */
512EAPI Eio_File *eio_dir_move(const char *source, 512EIO_API Eio_File *eio_dir_move(const char *source,
513 const char *dest, 513 const char *dest,
514 Eio_Filter_Direct_Cb filter_cb, 514 Eio_Filter_Direct_Cb filter_cb,
515 Eio_Progress_Cb progress_cb, 515 Eio_Progress_Cb progress_cb,
@@ -537,7 +537,7 @@ EAPI Eio_File *eio_dir_move(const char *source,
537 * want to pass the file to the main_cb or not. Return EINA_TRUE to pass it to 537 * want to pass the file to the main_cb or not. Return EINA_TRUE to pass it to
538 * the main_cb or EINA_FALSE to ignore it. 538 * the main_cb or EINA_FALSE to ignore it.
539 */ 539 */
540EAPI Eio_File *eio_dir_copy(const char *source, 540EIO_API Eio_File *eio_dir_copy(const char *source,
541 const char *dest, 541 const char *dest,
542 Eio_Filter_Direct_Cb filter_cb, 542 Eio_Filter_Direct_Cb filter_cb,
543 Eio_Progress_Cb progress_cb, 543 Eio_Progress_Cb progress_cb,
@@ -562,7 +562,7 @@ EAPI Eio_File *eio_dir_copy(const char *source,
562 * want to pass the file to the main_cb or not. Return EINA_TRUE to pass it to 562 * want to pass the file to the main_cb or not. Return EINA_TRUE to pass it to
563 * the main_cb or EINA_FALSE to ignore it. 563 * the main_cb or EINA_FALSE to ignore it.
564 */ 564 */
565EAPI Eio_File *eio_dir_unlink(const char *path, 565EIO_API Eio_File *eio_dir_unlink(const char *path,
566 Eio_Filter_Direct_Cb filter_cb, 566 Eio_Filter_Direct_Cb filter_cb,
567 Eio_Progress_Cb progress_cb, 567 Eio_Progress_Cb progress_cb,
568 Eio_Done_Cb done_cb, 568 Eio_Done_Cb done_cb,
@@ -593,7 +593,7 @@ EAPI Eio_File *eio_dir_unlink(const char *path,
593 * @param data Unmodified user data passed to callbacks 593 * @param data Unmodified user data passed to callbacks
594 * @return A reference to the I/O operation. 594 * @return A reference to the I/O operation.
595 */ 595 */
596EAPI Eio_File *eio_file_xattr(const char *path, 596EIO_API Eio_File *eio_file_xattr(const char *path,
597 Eio_Filter_Cb filter_cb, 597 Eio_Filter_Cb filter_cb,
598 Eio_Main_Cb main_cb, 598 Eio_Main_Cb main_cb,
599 Eio_Done_Cb done_cb, 599 Eio_Done_Cb done_cb,
@@ -614,7 +614,7 @@ EAPI Eio_File *eio_file_xattr(const char *path,
614 * eio_file_xattr_int_set calls eina_xattr_int_set from another thread. This prevents blocking in your apps. If 614 * eio_file_xattr_int_set calls eina_xattr_int_set from another thread. This prevents blocking in your apps. If
615 * the writing succeeded, the done_cb will be called even if a cancel was requested, but came too late. 615 * the writing succeeded, the done_cb will be called even if a cancel was requested, but came too late.
616 */ 616 */
617EAPI Eio_File *eio_file_xattr_int_set(const char *path, 617EIO_API Eio_File *eio_file_xattr_int_set(const char *path,
618 const char *attribute, 618 const char *attribute,
619 int xattr_int, 619 int xattr_int,
620 Eina_Xattr_Flags flags, 620 Eina_Xattr_Flags flags,
@@ -636,7 +636,7 @@ EAPI Eio_File *eio_file_xattr_int_set(const char *path,
636 * eio_file_xattr_double_set calls eina_xattr_double_set from another thread. This prevents blocking in your apps. If 636 * eio_file_xattr_double_set calls eina_xattr_double_set from another thread. This prevents blocking in your apps. If
637 * the writing succeeded, the done_cb will be called even if a cancel was requested, but came too late. 637 * the writing succeeded, the done_cb will be called even if a cancel was requested, but came too late.
638 */ 638 */
639EAPI Eio_File *eio_file_xattr_double_set(const char *path, 639EIO_API Eio_File *eio_file_xattr_double_set(const char *path,
640 const char *attribute, 640 const char *attribute,
641 double xattr_double, 641 double xattr_double,
642 Eina_Xattr_Flags flags, 642 Eina_Xattr_Flags flags,
@@ -657,7 +657,7 @@ EAPI Eio_File *eio_file_xattr_double_set(const char *path,
657 * eio_file_xattr_string_set calls eina_xattr_string_set from another thread. This prevents blocking in your apps. If 657 * eio_file_xattr_string_set calls eina_xattr_string_set from another thread. This prevents blocking in your apps. If
658 * the writing succeeded, the done_cb will be called even if a cancel was requested, but came too late. 658 * the writing succeeded, the done_cb will be called even if a cancel was requested, but came too late.
659 */ 659 */
660EAPI Eio_File *eio_file_xattr_string_set(const char *path, 660EIO_API Eio_File *eio_file_xattr_string_set(const char *path,
661 const char *attribute, 661 const char *attribute,
662 const char *xattr_string, 662 const char *xattr_string,
663 Eina_Xattr_Flags flags, 663 Eina_Xattr_Flags flags,
@@ -679,7 +679,7 @@ EAPI Eio_File *eio_file_xattr_string_set(const char *path,
679 * eio_file_xattr_set calls setxattr from another thread. This prevents blocking in your apps. If 679 * eio_file_xattr_set calls setxattr from another thread. This prevents blocking in your apps. If
680 * the writing succeeded, the done_cb will be called even if a cancel was requested, but came too late. 680 * the writing succeeded, the done_cb will be called even if a cancel was requested, but came too late.
681 */ 681 */
682EAPI Eio_File *eio_file_xattr_set(const char *path, 682EIO_API Eio_File *eio_file_xattr_set(const char *path,
683 const char *attribute, 683 const char *attribute,
684 const char *xattr_data, 684 const char *xattr_data,
685 unsigned int xattr_size, 685 unsigned int xattr_size,
@@ -699,7 +699,7 @@ EAPI Eio_File *eio_file_xattr_set(const char *path,
699 * 699 *
700 * eio_file_xattr_get calls getxattr from another thread. This prevents blocking in your apps. 700 * eio_file_xattr_get calls getxattr from another thread. This prevents blocking in your apps.
701 */ 701 */
702EAPI Eio_File *eio_file_xattr_get(const char *path, 702EIO_API Eio_File *eio_file_xattr_get(const char *path,
703 const char *attribute, 703 const char *attribute,
704 Eio_Done_Data_Cb done_cb, 704 Eio_Done_Data_Cb done_cb,
705 Eio_Error_Cb error_cb, 705 Eio_Error_Cb error_cb,
@@ -715,7 +715,7 @@ EAPI Eio_File *eio_file_xattr_get(const char *path,
715 * 715 *
716 * eio_file_xattr_int_get calls eina_xattr_int_get from another thread. This prevents blocking in your apps. 716 * eio_file_xattr_int_get calls eina_xattr_int_get from another thread. This prevents blocking in your apps.
717 */ 717 */
718EAPI Eio_File *eio_file_xattr_int_get(const char *path, 718EIO_API Eio_File *eio_file_xattr_int_get(const char *path,
719 const char *attribute, 719 const char *attribute,
720 Eio_Done_Int_Cb done_cb, 720 Eio_Done_Int_Cb done_cb,
721 Eio_Error_Cb error_cb, 721 Eio_Error_Cb error_cb,
@@ -731,7 +731,7 @@ EAPI Eio_File *eio_file_xattr_int_get(const char *path,
731 * 731 *
732 * eio_file_xattr_double_get calls eina_xattr_double_get from another thread. This prevents blocking in your apps. 732 * eio_file_xattr_double_get calls eina_xattr_double_get from another thread. This prevents blocking in your apps.
733 */ 733 */
734EAPI Eio_File *eio_file_xattr_double_get(const char *path, 734EIO_API Eio_File *eio_file_xattr_double_get(const char *path,
735 const char *attribute, 735 const char *attribute,
736 Eio_Done_Double_Cb done_cb, 736 Eio_Done_Double_Cb done_cb,
737 Eio_Error_Cb error_cb, 737 Eio_Error_Cb error_cb,
@@ -747,7 +747,7 @@ EAPI Eio_File *eio_file_xattr_double_get(const char *path,
747 * 747 *
748 * eio_file_xattr_string_get calls eina_xattr_string_get from another thread. This prevents blocking in your apps. 748 * eio_file_xattr_string_get calls eina_xattr_string_get from another thread. This prevents blocking in your apps.
749 */ 749 */
750EAPI Eio_File *eio_file_xattr_string_get(const char *path, 750EIO_API Eio_File *eio_file_xattr_string_get(const char *path,
751 const char *attribute, 751 const char *attribute,
752 Eio_Done_String_Cb done_cb, 752 Eio_Done_String_Cb done_cb,
753 Eio_Error_Cb error_cb, 753 Eio_Error_Cb error_cb,
@@ -774,13 +774,13 @@ EAPI Eio_File *eio_file_xattr_string_get(const char *path,
774 * @brief Initialize eio and all its required submodule. 774 * @brief Initialize eio and all its required submodule.
775 * @return the current number of eio users. 775 * @return the current number of eio users.
776 */ 776 */
777EAPI int eio_init(void); 777EIO_API int eio_init(void);
778 778
779/** 779/**
780 * @brief Shutdown eio and all its submodule if possible. 780 * @brief Shutdown eio and all its submodule if possible.
781 * @return the number of pending users of eio. 781 * @return the number of pending users of eio.
782 */ 782 */
783EAPI int eio_shutdown(void); 783EIO_API int eio_shutdown(void);
784 784
785/** 785/**
786 * @brief Set the limit to the maximum amount of memory used 786 * @brief Set the limit to the maximum amount of memory used
@@ -798,7 +798,7 @@ EAPI int eio_shutdown(void);
798 * the thread might stall. 798 * the thread might stall.
799 * @since 1.10 799 * @since 1.10
800 */ 800 */
801EAPI void eio_memory_burst_limit_set(size_t limit); 801EIO_API void eio_memory_burst_limit_set(size_t limit);
802 802
803/** 803/**
804 * @brief Get the actual limit to the maximum amount of memory used 804 * @brief Get the actual limit to the maximum amount of memory used
@@ -807,7 +807,7 @@ EAPI void eio_memory_burst_limit_set(size_t limit);
807 * @since 1.10 807 * @since 1.10
808 * @see eio_memory_burst_limit_set 808 * @see eio_memory_burst_limit_set
809 */ 809 */
810EAPI size_t eio_memory_burst_limit_get(void); 810EIO_API size_t eio_memory_burst_limit_get(void);
811 811
812/** 812/**
813 * @brief Return the container during EIO operation 813 * @brief Return the container during EIO operation
@@ -817,7 +817,7 @@ EAPI size_t eio_memory_burst_limit_get(void);
817 * This is only available and make sense in the thread callback, not in 817 * This is only available and make sense in the thread callback, not in
818 * the mainloop. 818 * the mainloop.
819 */ 819 */
820EAPI void *eio_file_container_get(Eio_File *ls); 820EIO_API void *eio_file_container_get(Eio_File *ls);
821 821
822/** 822/**
823 * @brief Cancel any Eio_File. 823 * @brief Cancel any Eio_File.
@@ -827,7 +827,7 @@ EAPI void *eio_file_container_get(Eio_File *ls);
827 * This will cancel any kind of I/O operation and cleanup the mess. This means 827 * This will cancel any kind of I/O operation and cleanup the mess. This means
828 * that it could take time to cancel an I/O. 828 * that it could take time to cancel an I/O.
829 */ 829 */
830EAPI Eina_Bool eio_file_cancel(Eio_File *ls); 830EIO_API Eina_Bool eio_file_cancel(Eio_File *ls);
831 831
832/** 832/**
833 * @brief Check if an Eio_File operation has been cancelled. 833 * @brief Check if an Eio_File operation has been cancelled.
@@ -836,7 +836,7 @@ EAPI Eina_Bool eio_file_cancel(Eio_File *ls);
836 * 836 *
837 * In case of an error it also return EINA_TRUE. 837 * In case of an error it also return EINA_TRUE.
838 */ 838 */
839EAPI Eina_Bool eio_file_check(Eio_File *ls); 839EIO_API Eina_Bool eio_file_check(Eio_File *ls);
840 840
841/** 841/**
842 * @brief Associate data with the current filtered file. 842 * @brief Associate data with the current filtered file.
@@ -851,7 +851,7 @@ EAPI Eina_Bool eio_file_check(Eio_File *ls);
851 * This function can only be safely called from within the filter callback. 851 * This function can only be safely called from within the filter callback.
852 * If you don't need to copy the key around you can use @ref eio_file_associate_direct_add 852 * If you don't need to copy the key around you can use @ref eio_file_associate_direct_add
853 */ 853 */
854EAPI Eina_Bool eio_file_associate_add(Eio_File *ls, 854EIO_API Eina_Bool eio_file_associate_add(Eio_File *ls,
855 const char *key, 855 const char *key,
856 const void *data, Eina_Free_Cb free_cb); 856 const void *data, Eina_Free_Cb free_cb);
857 857
@@ -867,7 +867,7 @@ EAPI Eina_Bool eio_file_associate_add(Eio_File *ls,
867 * If you need eio to make a proper copy of the @p key to be safe use 867 * If you need eio to make a proper copy of the @p key to be safe use
868 * @ref eio_file_associate_add instead. 868 * @ref eio_file_associate_add instead.
869 */ 869 */
870EAPI Eina_Bool eio_file_associate_direct_add(Eio_File *ls, 870EIO_API Eina_Bool eio_file_associate_direct_add(Eio_File *ls,
871 const char *key, 871 const char *key,
872 const void *data, Eina_Free_Cb free_cb); 872 const void *data, Eina_Free_Cb free_cb);
873 873
@@ -877,7 +877,7 @@ EAPI Eina_Bool eio_file_associate_direct_add(Eio_File *ls,
877 * @param key The key pointing to the data to retrieve. 877 * @param key The key pointing to the data to retrieve.
878 * @return the data associated with the key or @p NULL if not found. 878 * @return the data associated with the key or @p NULL if not found.
879 */ 879 */
880EAPI void *eio_file_associate_find(Eio_File *ls, const char *key); 880EIO_API void *eio_file_associate_find(Eio_File *ls, const char *key);
881 881
882/** 882/**
883 * @} 883 * @}
@@ -909,7 +909,7 @@ EAPI void *eio_file_associate_find(Eio_File *ls, const char *key);
909 * @return Pointer to the file if successful or NULL otherwise. 909 * @return Pointer to the file if successful or NULL otherwise.
910 * 910 *
911 */ 911 */
912EAPI Eio_File *eio_file_open(const char *name, Eina_Bool shared, 912EIO_API Eio_File *eio_file_open(const char *name, Eina_Bool shared,
913 Eio_Open_Cb open_cb, 913 Eio_Open_Cb open_cb,
914 Eio_Error_Cb error_cb, 914 Eio_Error_Cb error_cb,
915 const void *data); 915 const void *data);
@@ -922,7 +922,7 @@ EAPI Eio_File *eio_file_open(const char *name, Eina_Bool shared,
922 * @param data Unmodified user data passed to callbacks 922 * @param data Unmodified user data passed to callbacks
923 * @return Pointer to the file if successful or NULL otherwise. 923 * @return Pointer to the file if successful or NULL otherwise.
924 */ 924 */
925EAPI Eio_File *eio_file_close(Eina_File *f, 925EIO_API Eio_File *eio_file_close(Eina_File *f,
926 Eio_Done_Cb done_cb, 926 Eio_Done_Cb done_cb,
927 Eio_Error_Cb error_cb, 927 Eio_Error_Cb error_cb,
928 const void *data); 928 const void *data);
@@ -939,7 +939,7 @@ EAPI Eio_File *eio_file_close(Eina_File *f,
939 * 939 *
940 * The container of the Eio_File is the Eina_File. 940 * The container of the Eio_File is the Eina_File.
941 */ 941 */
942EAPI Eio_File *eio_file_map_all(Eina_File *f, 942EIO_API Eio_File *eio_file_map_all(Eina_File *f,
943 Eina_File_Populate rule, 943 Eina_File_Populate rule,
944 Eio_Filter_Map_Cb filter_cb, 944 Eio_Filter_Map_Cb filter_cb,
945 Eio_Map_Cb map_cb, 945 Eio_Map_Cb map_cb,
@@ -960,7 +960,7 @@ EAPI Eio_File *eio_file_map_all(Eina_File *f,
960 * 960 *
961 * The container of the Eio_File is the Eina_File. 961 * The container of the Eio_File is the Eina_File.
962 */ 962 */
963EAPI Eio_File *eio_file_map_new(Eina_File *f, 963EIO_API Eio_File *eio_file_map_new(Eina_File *f,
964 Eina_File_Populate rule, 964 Eina_File_Populate rule,
965 unsigned long int offset, 965 unsigned long int offset,
966 unsigned long int length, 966 unsigned long int length,
@@ -994,7 +994,7 @@ EAPI Eio_File *eio_file_map_new(Eina_File *f,
994 * 994 *
995 * This function calls eet_open() from another thread using Ecore_Thread. 995 * This function calls eet_open() from another thread using Ecore_Thread.
996 */ 996 */
997EAPI Eio_File *eio_eet_open(const char *filename, 997EIO_API Eio_File *eio_eet_open(const char *filename,
998 Eet_File_Mode mode, 998 Eet_File_Mode mode,
999 Eio_Eet_Open_Cb eet_cb, 999 Eio_Eet_Open_Cb eet_cb,
1000 Eio_Error_Cb error_cb, 1000 Eio_Error_Cb error_cb,
@@ -1011,7 +1011,7 @@ EAPI Eio_File *eio_eet_open(const char *filename,
1011 * using Ecore_Thread. You should assume that the Eet_File is dead after this 1011 * using Ecore_Thread. You should assume that the Eet_File is dead after this
1012 * function is called. 1012 * function is called.
1013 */ 1013 */
1014EAPI Eio_File *eio_eet_close(Eet_File *ef, 1014EIO_API Eio_File *eio_eet_close(Eet_File *ef,
1015 Eio_Done_Cb done_cb, 1015 Eio_Done_Cb done_cb,
1016 Eio_Eet_Error_Cb error_cb, 1016 Eio_Eet_Error_Cb error_cb,
1017 const void *data); 1017 const void *data);
@@ -1027,7 +1027,7 @@ EAPI Eio_File *eio_eet_close(Eet_File *ef,
1027 * This function will call eet_sync() from another thread. As long as the done_cb or 1027 * This function will call eet_sync() from another thread. As long as the done_cb or
1028 * error_cb haven't be called, you must keep @p ef open. 1028 * error_cb haven't be called, you must keep @p ef open.
1029 */ 1029 */
1030EAPI Eio_File *eio_eet_sync(Eet_File *ef, 1030EIO_API Eio_File *eio_eet_sync(Eet_File *ef,
1031 Eio_Done_Cb done_cb, 1031 Eio_Done_Cb done_cb,
1032 Eio_Eet_Error_Cb error_cb, 1032 Eio_Eet_Error_Cb error_cb,
1033 const void *data); 1033 const void *data);
@@ -1046,7 +1046,7 @@ EAPI Eio_File *eio_eet_sync(Eet_File *ef,
1046 * @param user_data Private data given to each callback. 1046 * @param user_data Private data given to each callback.
1047 * @return NULL in case of a failure. 1047 * @return NULL in case of a failure.
1048 */ 1048 */
1049EAPI Eio_File *eio_eet_data_write_cipher(Eet_File *ef, 1049EIO_API Eio_File *eio_eet_data_write_cipher(Eet_File *ef,
1050 Eet_Data_Descriptor *edd, 1050 Eet_Data_Descriptor *edd,
1051 const char *name, 1051 const char *name,
1052 const char *cipher_key, 1052 const char *cipher_key,
@@ -1067,7 +1067,7 @@ EAPI Eio_File *eio_eet_data_write_cipher(Eet_File *ef,
1067 * @param data Unmodified user data passed to callbacks 1067 * @param data Unmodified user data passed to callbacks
1068 * @return NULL in case of a failure. 1068 * @return NULL in case of a failure.
1069 */ 1069 */
1070EAPI Eio_File *eio_eet_data_read_cipher(Eet_File *ef, 1070EIO_API Eio_File *eio_eet_data_read_cipher(Eet_File *ef,
1071 Eet_Data_Descriptor *edd, 1071 Eet_Data_Descriptor *edd,
1072 const char *name, 1072 const char *name,
1073 const char *cipher_key, 1073 const char *cipher_key,
@@ -1092,7 +1092,7 @@ EAPI Eio_File *eio_eet_data_read_cipher(Eet_File *ef,
1092 * @param user_data Private data given to each callback. 1092 * @param user_data Private data given to each callback.
1093 * @return NULL in case of a failure. 1093 * @return NULL in case of a failure.
1094 */ 1094 */
1095EAPI Eio_File *eio_eet_data_image_write_cipher(Eet_File *ef, 1095EIO_API Eio_File *eio_eet_data_image_write_cipher(Eet_File *ef,
1096 const char *name, 1096 const char *name,
1097 const char *cipher_key, 1097 const char *cipher_key,
1098 void *write_data, 1098 void *write_data,
@@ -1115,7 +1115,7 @@ EAPI Eio_File *eio_eet_data_image_write_cipher(Eet_File *ef,
1115 * @param data Unmodified user data passed to callbacks 1115 * @param data Unmodified user data passed to callbacks
1116 * @return NULL in case of a failure. 1116 * @return NULL in case of a failure.
1117 */ 1117 */
1118EAPI Eio_File *eio_eet_read_direct(Eet_File *ef, 1118EIO_API Eio_File *eio_eet_read_direct(Eet_File *ef,
1119 const char *name, 1119 const char *name,
1120 Eio_Done_Data_Cb done_cb, 1120 Eio_Done_Data_Cb done_cb,
1121 Eio_Error_Cb error_cb, 1121 Eio_Error_Cb error_cb,
@@ -1131,7 +1131,7 @@ EAPI Eio_File *eio_eet_read_direct(Eet_File *ef,
1131 * @param data Unmodified user data passed to callbacks 1131 * @param data Unmodified user data passed to callbacks
1132 * @return NULL in case of a failure. 1132 * @return NULL in case of a failure.
1133 */ 1133 */
1134EAPI Eio_File *eio_eet_read_cipher(Eet_File *ef, 1134EIO_API Eio_File *eio_eet_read_cipher(Eet_File *ef,
1135 const char *name, 1135 const char *name,
1136 const char *cipher_key, 1136 const char *cipher_key,
1137 Eio_Done_Read_Cb done_cb, 1137 Eio_Done_Read_Cb done_cb,
@@ -1151,7 +1151,7 @@ EAPI Eio_File *eio_eet_read_cipher(Eet_File *ef,
1151 * @param user_data Private data given to each callback. 1151 * @param user_data Private data given to each callback.
1152 * @return NULL in case of a failure. 1152 * @return NULL in case of a failure.
1153 */ 1153 */
1154EAPI Eio_File *eio_eet_write_cipher(Eet_File *ef, 1154EIO_API Eio_File *eio_eet_write_cipher(Eet_File *ef,
1155 const char *name, 1155 const char *name,
1156 void *write_data, 1156 void *write_data,
1157 int size, 1157 int size,
@@ -1178,17 +1178,17 @@ EAPI Eio_File *eio_eet_write_cipher(Eet_File *ef,
1178 * @{ 1178 * @{
1179 */ 1179 */
1180 1180
1181EAPI extern int EIO_MONITOR_FILE_CREATED; /**< A new file was created in a watched directory */ 1181EIO_API extern int EIO_MONITOR_FILE_CREATED; /**< A new file was created in a watched directory */
1182EAPI extern int EIO_MONITOR_FILE_DELETED; /**< A watched file was deleted, or a file in a watched directory was deleted */ 1182EIO_API extern int EIO_MONITOR_FILE_DELETED; /**< A watched file was deleted, or a file in a watched directory was deleted */
1183EAPI extern int EIO_MONITOR_FILE_MODIFIED; /**< A file was modified in a watched directory */ 1183EIO_API extern int EIO_MONITOR_FILE_MODIFIED; /**< A file was modified in a watched directory */
1184EAPI extern int EIO_MONITOR_FILE_CLOSED; /**< A file was closed in a watched directory. This event is never sent on Windows and OSX, or for non-fallback monitors */ 1184EIO_API extern int EIO_MONITOR_FILE_CLOSED; /**< A file was closed in a watched directory. This event is never sent on Windows and OSX, or for non-fallback monitors */
1185EAPI extern int EIO_MONITOR_DIRECTORY_CREATED; /**< A new directory was created in a watched directory */ 1185EIO_API extern int EIO_MONITOR_DIRECTORY_CREATED; /**< A new directory was created in a watched directory */
1186EAPI extern int EIO_MONITOR_DIRECTORY_DELETED; /**< A directory has been deleted: this can be either a watched directory or one of its subdirectories */ 1186EIO_API extern int EIO_MONITOR_DIRECTORY_DELETED; /**< A directory has been deleted: this can be either a watched directory or one of its subdirectories */
1187EAPI extern int EIO_MONITOR_DIRECTORY_MODIFIED; /**< A directory has been modified in a watched directory */ 1187EIO_API extern int EIO_MONITOR_DIRECTORY_MODIFIED; /**< A directory has been modified in a watched directory */
1188EAPI extern int EIO_MONITOR_DIRECTORY_CLOSED; /**< A directory has been closed in a watched directory. This event is never sent on Windows and OSX, or for non-fallback monitors */ 1188EIO_API extern int EIO_MONITOR_DIRECTORY_CLOSED; /**< A directory has been closed in a watched directory. This event is never sent on Windows and OSX, or for non-fallback monitors */
1189EAPI extern int EIO_MONITOR_SELF_RENAME; /**< The monitored path has been renamed, an error could happen just after if the renamed path doesn't exist. This event is never sent on OSX, or for non-fallback monitors */ 1189EIO_API extern int EIO_MONITOR_SELF_RENAME; /**< The monitored path has been renamed, an error could happen just after if the renamed path doesn't exist. This event is never sent on OSX, or for non-fallback monitors */
1190EAPI extern int EIO_MONITOR_SELF_DELETED; /**< The monitored path has been removed. This event is never sent on OSX */ 1190EIO_API extern int EIO_MONITOR_SELF_DELETED; /**< The monitored path has been removed. This event is never sent on OSX */
1191EAPI extern int EIO_MONITOR_ERROR; /**< During operation the monitor failed and will no longer work. eio_monitor_del must be called on it. */ 1191EIO_API extern int EIO_MONITOR_ERROR; /**< During operation the monitor failed and will no longer work. eio_monitor_del must be called on it. */
1192 1192
1193typedef struct _Eio_Monitor Eio_Monitor; 1193typedef struct _Eio_Monitor Eio_Monitor;
1194 1194
@@ -1217,7 +1217,7 @@ struct _Eio_Monitor_Event
1217 * list of files to monitor. It utilizes the inotify mechanism 1217 * list of files to monitor. It utilizes the inotify mechanism
1218 * introduced in kernel 2.6.13 for passive monitoring. 1218 * introduced in kernel 2.6.13 for passive monitoring.
1219 */ 1219 */
1220EAPI Eio_Monitor *eio_monitor_add(const char *path); 1220EIO_API Eio_Monitor *eio_monitor_add(const char *path);
1221 1221
1222/** 1222/**
1223 * @brief Adds a file/directory to monitor 1223 * @brief Adds a file/directory to monitor
@@ -1230,7 +1230,7 @@ EAPI Eio_Monitor *eio_monitor_add(const char *path);
1230 * This function is just like eio_monitor_add(), however the string passed by 1230 * This function is just like eio_monitor_add(), however the string passed by
1231 * argument must be created using eina_stringshare_add(). 1231 * argument must be created using eina_stringshare_add().
1232 */ 1232 */
1233EAPI Eio_Monitor *eio_monitor_stringshared_add(const char *path); 1233EIO_API Eio_Monitor *eio_monitor_stringshared_add(const char *path);
1234 1234
1235/** 1235/**
1236 * @brief Deletes a path from the “watched” list 1236 * @brief Deletes a path from the “watched” list
@@ -1238,7 +1238,7 @@ EAPI Eio_Monitor *eio_monitor_stringshared_add(const char *path);
1238 * It can only be an Eio_Monitor returned to you from calling 1238 * It can only be an Eio_Monitor returned to you from calling
1239 * eio_monitor_add() or eio_monitor_stringshared_add() 1239 * eio_monitor_add() or eio_monitor_stringshared_add()
1240 */ 1240 */
1241EAPI void eio_monitor_del(Eio_Monitor *monitor); 1241EIO_API void eio_monitor_del(Eio_Monitor *monitor);
1242 1242
1243/** 1243/**
1244 * @brief returns the path being watched by the given 1244 * @brief returns the path being watched by the given
@@ -1246,7 +1246,7 @@ EAPI void eio_monitor_del(Eio_Monitor *monitor);
1246 * @param monitor Eio_Monitor to return the path of 1246 * @param monitor Eio_Monitor to return the path of
1247 * @return The stringshared path belonging to @p monitor 1247 * @return The stringshared path belonging to @p monitor
1248 */ 1248 */
1249EAPI const char *eio_monitor_path_get(Eio_Monitor *monitor); 1249EIO_API const char *eio_monitor_path_get(Eio_Monitor *monitor);
1250 1250
1251#ifdef EFL_BETA_API_SUPPORT 1251#ifdef EFL_BETA_API_SUPPORT
1252/** 1252/**
@@ -1259,7 +1259,7 @@ EAPI const char *eio_monitor_path_get(Eio_Monitor *monitor);
1259 * 1259 *
1260 * @since 1.21 1260 * @since 1.21
1261 */ 1261 */
1262EAPI Eina_Bool eio_monitor_fallback_check(const Eio_Monitor *monitor); 1262EIO_API Eina_Bool eio_monitor_fallback_check(const Eio_Monitor *monitor);
1263 1263
1264/** 1264/**
1265 * @brief Check if a monitor has the context about a file or not 1265 * @brief Check if a monitor has the context about a file or not
@@ -1276,7 +1276,7 @@ EAPI Eina_Bool eio_monitor_fallback_check(const Eio_Monitor *monitor);
1276 * 1276 *
1277 * @since 1.23 1277 * @since 1.23
1278 */ 1278 */
1279EAPI Eina_Bool eio_monitor_has_context(const Eio_Monitor *monitor, const char *path); 1279EIO_API Eina_Bool eio_monitor_has_context(const Eio_Monitor *monitor, const char *path);
1280#endif 1280#endif
1281/** 1281/**
1282 * @} 1282 * @}
diff --git a/src/lib/eio/eio_dir.c b/src/lib/eio/eio_dir.c
index 076d337764..435b712219 100644
--- a/src/lib/eio/eio_dir.c
+++ b/src/lib/eio/eio_dir.c
@@ -845,7 +845,7 @@ _eio_dir_stat_error(void *data, Ecore_Thread *thread EINA_UNUSED)
845 *============================================================================*/ 845 *============================================================================*/
846 846
847 847
848EAPI Eio_File * 848EIO_API Eio_File *
849eio_dir_copy(const char *source, 849eio_dir_copy(const char *source,
850 const char *dest, 850 const char *dest,
851 Eio_Filter_Direct_Cb filter_cb, 851 Eio_Filter_Direct_Cb filter_cb,
@@ -886,7 +886,7 @@ eio_dir_copy(const char *source,
886 return &copy->progress.common; 886 return &copy->progress.common;
887} 887}
888 888
889EAPI Eio_File * 889EIO_API Eio_File *
890eio_dir_move(const char *source, 890eio_dir_move(const char *source,
891 const char *dest, 891 const char *dest,
892 Eio_Filter_Direct_Cb filter_cb, 892 Eio_Filter_Direct_Cb filter_cb,
@@ -927,7 +927,7 @@ eio_dir_move(const char *source,
927 return &move->progress.common; 927 return &move->progress.common;
928} 928}
929 929
930EAPI Eio_File * 930EIO_API Eio_File *
931eio_dir_unlink(const char *path, 931eio_dir_unlink(const char *path,
932 Eio_Filter_Direct_Cb filter_cb, 932 Eio_Filter_Direct_Cb filter_cb,
933 Eio_Progress_Cb progress_cb, 933 Eio_Progress_Cb progress_cb,
@@ -1014,7 +1014,7 @@ _eio_dir_stat_internal_ls(const char *dir,
1014 return &async->ls.common; 1014 return &async->ls.common;
1015} 1015}
1016 1016
1017EAPI Eio_File * 1017EIO_API Eio_File *
1018eio_dir_stat_ls(const char *dir, 1018eio_dir_stat_ls(const char *dir,
1019 Eio_Filter_Direct_Cb filter_cb, 1019 Eio_Filter_Direct_Cb filter_cb,
1020 Eio_Main_Direct_Cb main_cb, 1020 Eio_Main_Direct_Cb main_cb,
@@ -1082,7 +1082,7 @@ _eio_dir_direct_internal_ls(const char *dir,
1082 return &async->ls.common; 1082 return &async->ls.common;
1083} 1083}
1084 1084
1085EAPI Eio_File * 1085EIO_API Eio_File *
1086eio_dir_direct_ls(const char *dir, 1086eio_dir_direct_ls(const char *dir,
1087 Eio_Filter_Dir_Cb filter_cb, 1087 Eio_Filter_Dir_Cb filter_cb,
1088 Eio_Main_Direct_Cb main_cb, 1088 Eio_Main_Direct_Cb main_cb,
diff --git a/src/lib/eio/eio_eet.c b/src/lib/eio/eio_eet.c
index 8abcf181c6..f007bec96c 100644
--- a/src/lib/eio/eio_eet.c
+++ b/src/lib/eio/eio_eet.c
@@ -307,7 +307,7 @@ _eio_eet_read_cipher_end(void *data, Ecore_Thread *thread EINA_UNUSED)
307 * API * 307 * API *
308 *============================================================================*/ 308 *============================================================================*/
309 309
310EAPI Eio_File * 310EIO_API Eio_File *
311eio_eet_open(const char *filename, 311eio_eet_open(const char *filename,
312 Eet_File_Mode mode, 312 Eet_File_Mode mode,
313 Eio_Eet_Open_Cb eet_cb, 313 Eio_Eet_Open_Cb eet_cb,
@@ -339,7 +339,7 @@ eio_eet_open(const char *filename,
339 return &eet->common; 339 return &eet->common;
340} 340}
341 341
342EAPI Eio_File * 342EIO_API Eio_File *
343eio_eet_close(Eet_File *ef, 343eio_eet_close(Eet_File *ef,
344 Eio_Done_Cb done_cb, 344 Eio_Done_Cb done_cb,
345 Eio_Eet_Error_Cb error_cb, 345 Eio_Eet_Error_Cb error_cb,
@@ -369,7 +369,7 @@ eio_eet_close(Eet_File *ef,
369 return &eet->common; 369 return &eet->common;
370} 370}
371 371
372EAPI Eio_File * 372EIO_API Eio_File *
373eio_eet_flush(Eet_File *ef, 373eio_eet_flush(Eet_File *ef,
374 Eio_Done_Cb done_cb, 374 Eio_Done_Cb done_cb,
375 Eio_Eet_Error_Cb error_cb, 375 Eio_Eet_Error_Cb error_cb,
@@ -399,7 +399,7 @@ eio_eet_flush(Eet_File *ef,
399 return &eet->common; 399 return &eet->common;
400} 400}
401 401
402EAPI Eio_File * 402EIO_API Eio_File *
403eio_eet_sync(Eet_File *ef, 403eio_eet_sync(Eet_File *ef,
404 Eio_Done_Cb done_cb, 404 Eio_Done_Cb done_cb,
405 Eio_Eet_Error_Cb error_cb, 405 Eio_Eet_Error_Cb error_cb,
@@ -408,7 +408,7 @@ eio_eet_sync(Eet_File *ef,
408 return eio_eet_flush(ef, done_cb, error_cb, data); 408 return eio_eet_flush(ef, done_cb, error_cb, data);
409} 409}
410 410
411EAPI Eio_File * 411EIO_API Eio_File *
412eio_eet_data_write_cipher(Eet_File *ef, 412eio_eet_data_write_cipher(Eet_File *ef,
413 Eet_Data_Descriptor *edd, 413 Eet_Data_Descriptor *edd,
414 const char *name, 414 const char *name,
@@ -450,7 +450,7 @@ eio_eet_data_write_cipher(Eet_File *ef,
450 return &ew->common; 450 return &ew->common;
451} 451}
452 452
453EAPI Eio_File * 453EIO_API Eio_File *
454eio_eet_data_read_cipher(Eet_File *ef, 454eio_eet_data_read_cipher(Eet_File *ef,
455 Eet_Data_Descriptor *edd, 455 Eet_Data_Descriptor *edd,
456 const char *name, 456 const char *name,
@@ -488,7 +488,7 @@ eio_eet_data_read_cipher(Eet_File *ef,
488 return &er->common; 488 return &er->common;
489} 489}
490 490
491EAPI Eio_File * 491EIO_API Eio_File *
492eio_eet_data_image_write_cipher(Eet_File *ef, 492eio_eet_data_image_write_cipher(Eet_File *ef,
493 const char *name, 493 const char *name,
494 const char *cipher_key, 494 const char *cipher_key,
@@ -537,7 +537,7 @@ eio_eet_data_image_write_cipher(Eet_File *ef,
537 return &eiw->common; 537 return &eiw->common;
538} 538}
539 539
540EAPI Eio_File * 540EIO_API Eio_File *
541eio_eet_read_direct(Eet_File *ef, 541eio_eet_read_direct(Eet_File *ef,
542 const char *name, 542 const char *name,
543 Eio_Done_Data_Cb done_cb, 543 Eio_Done_Data_Cb done_cb,
@@ -572,7 +572,7 @@ eio_eet_read_direct(Eet_File *ef,
572 return &er->common; 572 return &er->common;
573} 573}
574 574
575EAPI Eio_File * 575EIO_API Eio_File *
576eio_eet_read_cipher(Eet_File *ef, 576eio_eet_read_cipher(Eet_File *ef,
577 const char *name, 577 const char *name,
578 const char *cipher_key, 578 const char *cipher_key,
@@ -607,7 +607,7 @@ eio_eet_read_cipher(Eet_File *ef,
607 return &er->common; 607 return &er->common;
608} 608}
609 609
610EAPI Eio_File * 610EIO_API Eio_File *
611eio_eet_write_cipher(Eet_File *ef, 611eio_eet_write_cipher(Eet_File *ef,
612 const char *name, 612 const char *name,
613 void *write_data, 613 void *write_data,
diff --git a/src/lib/eio/eio_file.c b/src/lib/eio/eio_file.c
index ae36d50ac7..388fc52a61 100644
--- a/src/lib/eio/eio_file.c
+++ b/src/lib/eio/eio_file.c
@@ -573,7 +573,7 @@ _eio_file_internal_ls(const char *dir,
573 return &async->ls.common; 573 return &async->ls.common;
574} 574}
575 575
576EAPI Eio_File * 576EIO_API Eio_File *
577eio_file_ls(const char *dir, 577eio_file_ls(const char *dir,
578 Eio_Filter_Cb filter_cb, 578 Eio_Filter_Cb filter_cb,
579 Eio_Main_Cb main_cb, 579 Eio_Main_Cb main_cb,
@@ -641,7 +641,7 @@ _eio_file_direct_internal_ls(const char *dir,
641 return &async->ls.common; 641 return &async->ls.common;
642} 642}
643 643
644EAPI Eio_File * 644EIO_API Eio_File *
645eio_file_direct_ls(const char *dir, 645eio_file_direct_ls(const char *dir,
646 Eio_Filter_Direct_Cb filter_cb, 646 Eio_Filter_Direct_Cb filter_cb,
647 Eio_Main_Direct_Cb main_cb, 647 Eio_Main_Direct_Cb main_cb,
@@ -709,7 +709,7 @@ _eio_file_stat_internal_ls(const char *dir,
709 return &async->ls.common; 709 return &async->ls.common;
710} 710}
711 711
712EAPI Eio_File * 712EIO_API Eio_File *
713eio_file_stat_ls(const char *dir, 713eio_file_stat_ls(const char *dir,
714 Eio_Filter_Direct_Cb filter_cb, 714 Eio_Filter_Direct_Cb filter_cb,
715 Eio_Main_Direct_Cb main_cb, 715 Eio_Main_Direct_Cb main_cb,
@@ -734,7 +734,7 @@ _eio_file_stat_ls(const char *dir,
734 return _eio_file_stat_internal_ls(dir, NULL, NULL, main_internal_cb, done_cb, error_cb, data); 734 return _eio_file_stat_internal_ls(dir, NULL, NULL, main_internal_cb, done_cb, error_cb, data);
735} 735}
736 736
737EAPI Eina_Bool 737EIO_API Eina_Bool
738eio_file_cancel(Eio_File *ls) 738eio_file_cancel(Eio_File *ls)
739{ 739{
740 if (!ls) return EINA_FALSE; 740 if (!ls) return EINA_FALSE;
@@ -748,21 +748,21 @@ eio_file_cancel(Eio_File *ls)
748 return ecore_thread_cancel(ls->thread); 748 return ecore_thread_cancel(ls->thread);
749} 749}
750 750
751EAPI Eina_Bool 751EIO_API Eina_Bool
752eio_file_check(Eio_File *ls) 752eio_file_check(Eio_File *ls)
753{ 753{
754 EINA_SAFETY_ON_NULL_RETURN_VAL(ls, EINA_TRUE); 754 EINA_SAFETY_ON_NULL_RETURN_VAL(ls, EINA_TRUE);
755 return ecore_thread_check(ls->thread); 755 return ecore_thread_check(ls->thread);
756} 756}
757 757
758EAPI void * 758EIO_API void *
759eio_file_container_get(Eio_File *ls) 759eio_file_container_get(Eio_File *ls)
760{ 760{
761 EINA_SAFETY_ON_NULL_RETURN_VAL(ls, NULL); 761 EINA_SAFETY_ON_NULL_RETURN_VAL(ls, NULL);
762 return ls->container; 762 return ls->container;
763} 763}
764 764
765EAPI Eina_Bool 765EIO_API Eina_Bool
766eio_file_associate_add(Eio_File *ls, 766eio_file_associate_add(Eio_File *ls,
767 const char *key, 767 const char *key,
768 const void *data, Eina_Free_Cb free_cb) 768 const void *data, Eina_Free_Cb free_cb)
@@ -778,7 +778,7 @@ eio_file_associate_add(Eio_File *ls,
778 eio_associate_malloc(data, free_cb)); 778 eio_associate_malloc(data, free_cb));
779} 779}
780 780
781EAPI Eina_Bool 781EIO_API Eina_Bool
782eio_file_associate_direct_add(Eio_File *ls, 782eio_file_associate_direct_add(Eio_File *ls,
783 const char *key, 783 const char *key,
784 const void *data, Eina_Free_Cb free_cb) 784 const void *data, Eina_Free_Cb free_cb)
@@ -794,7 +794,7 @@ eio_file_associate_direct_add(Eio_File *ls,
794 eio_associate_malloc(data, free_cb)); 794 eio_associate_malloc(data, free_cb));
795} 795}
796 796
797EAPI void * 797EIO_API void *
798eio_file_associate_find(Eio_File *ls, const char *key) 798eio_file_associate_find(Eio_File *ls, const char *key)
799{ 799{
800 Eio_File_Associate *search; 800 Eio_File_Associate *search;
@@ -809,7 +809,7 @@ eio_file_associate_find(Eio_File *ls, const char *key)
809 return search->data; 809 return search->data;
810} 810}
811 811
812EAPI Eio_File * 812EIO_API Eio_File *
813eio_file_copy(const char *source, 813eio_file_copy(const char *source,
814 const char *dest, 814 const char *dest,
815 Eio_Progress_Cb progress_cb, 815 Eio_Progress_Cb progress_cb,
@@ -845,7 +845,7 @@ eio_file_copy(const char *source,
845 return &copy->common; 845 return &copy->common;
846} 846}
847 847
848EAPI Eio_File * 848EIO_API Eio_File *
849eio_file_move(const char *source, 849eio_file_move(const char *source,
850 const char *dest, 850 const char *dest,
851 Eio_Progress_Cb progress_cb, 851 Eio_Progress_Cb progress_cb,
diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index 5c2141113d..b85e52b2c5 100644
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -24,7 +24,7 @@
24 *============================================================================*/ 24 *============================================================================*/
25 25
26static Eio_Version _version = { VMAJ, VMIN, VMIC, VREV }; 26static Eio_Version _version = { VMAJ, VMIN, VMIC, VREV };
27EAPI Eio_Version *eio_version = &_version; 27EIO_API Eio_Version *eio_version = &_version;
28 28
29/** 29/**
30 * @cond LOCAL 30 * @cond LOCAL
@@ -272,7 +272,7 @@ eio_file_unregister(Eio_File *common)
272 * API * 272 * API *
273 *============================================================================*/ 273 *============================================================================*/
274 274
275EAPI int 275EIO_API int
276eio_init(void) 276eio_init(void)
277{ 277{
278 if (++_eio_init_count != 1) 278 if (++_eio_init_count != 1)
@@ -336,7 +336,7 @@ shutdown_eina:
336 return --_eio_init_count; 336 return --_eio_init_count;
337} 337}
338 338
339EAPI int 339EIO_API int
340eio_shutdown(void) 340eio_shutdown(void)
341{ 341{
342 Eio_File_Direct_Info *info; 342 Eio_File_Direct_Info *info;
@@ -409,7 +409,7 @@ eio_shutdown(void)
409 return _eio_init_count; 409 return _eio_init_count;
410} 410}
411 411
412EAPI void 412EIO_API void
413eio_memory_burst_limit_set(size_t limit) 413eio_memory_burst_limit_set(size_t limit)
414{ 414{
415 eina_lock_take(&(memory_pool_mutex)); 415 eina_lock_take(&(memory_pool_mutex));
@@ -422,7 +422,7 @@ eio_memory_burst_limit_set(size_t limit)
422 eina_lock_release(&(memory_pool_mutex)); 422 eina_lock_release(&(memory_pool_mutex));
423} 423}
424 424
425EAPI size_t 425EIO_API size_t
426eio_memory_burst_limit_get(void) 426eio_memory_burst_limit_get(void)
427{ 427{
428 return memory_pool_limit; 428 return memory_pool_limit;
diff --git a/src/lib/eio/eio_map.c b/src/lib/eio/eio_map.c
index 897519f966..61be9122d9 100644
--- a/src/lib/eio/eio_map.c
+++ b/src/lib/eio/eio_map.c
@@ -179,7 +179,7 @@ _eio_file_map_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
179 * API * 179 * API *
180 *============================================================================*/ 180 *============================================================================*/
181 181
182EAPI Eio_File * 182EIO_API Eio_File *
183eio_file_open(const char *name, Eina_Bool shared, 183eio_file_open(const char *name, Eina_Bool shared,
184 Eio_Open_Cb open_cb, 184 Eio_Open_Cb open_cb,
185 Eio_Error_Cb error_cb, 185 Eio_Error_Cb error_cb,
@@ -211,7 +211,7 @@ eio_file_open(const char *name, Eina_Bool shared,
211 return &map->common; 211 return &map->common;
212} 212}
213 213
214EAPI Eio_File * 214EIO_API Eio_File *
215eio_file_close(Eina_File *f, 215eio_file_close(Eina_File *f,
216 Eio_Done_Cb done_cb, 216 Eio_Done_Cb done_cb,
217 Eio_Error_Cb error_cb, 217 Eio_Error_Cb error_cb,
@@ -241,7 +241,7 @@ eio_file_close(Eina_File *f,
241 return &map->common; 241 return &map->common;
242} 242}
243 243
244EAPI Eio_File * 244EIO_API Eio_File *
245eio_file_map_all(Eina_File *f, 245eio_file_map_all(Eina_File *f,
246 Eina_File_Populate rule, 246 Eina_File_Populate rule,
247 Eio_Filter_Map_Cb filter_cb, 247 Eio_Filter_Map_Cb filter_cb,
@@ -277,7 +277,7 @@ eio_file_map_all(Eina_File *f,
277 return &map->common; 277 return &map->common;
278} 278}
279 279
280EAPI Eio_File * 280EIO_API Eio_File *
281eio_file_map_new(Eina_File *f, 281eio_file_map_new(Eina_File *f,
282 Eina_File_Populate rule, 282 Eina_File_Populate rule,
283 unsigned long int offset, 283 unsigned long int offset,
diff --git a/src/lib/eio/eio_monitor.c b/src/lib/eio/eio_monitor.c
index 64eab219b2..09df78376c 100644
--- a/src/lib/eio/eio_monitor.c
+++ b/src/lib/eio/eio_monitor.c
@@ -302,19 +302,19 @@ _eio_monitor_rename(Eio_Monitor *monitor, const char *newpath)
302 * API * 302 * API *
303 *============================================================================*/ 303 *============================================================================*/
304 304
305EAPI int EIO_MONITOR_ERROR; 305EIO_API int EIO_MONITOR_ERROR;
306EAPI int EIO_MONITOR_FILE_CREATED; 306EIO_API int EIO_MONITOR_FILE_CREATED;
307EAPI int EIO_MONITOR_FILE_DELETED; 307EIO_API int EIO_MONITOR_FILE_DELETED;
308EAPI int EIO_MONITOR_FILE_MODIFIED; 308EIO_API int EIO_MONITOR_FILE_MODIFIED;
309EAPI int EIO_MONITOR_FILE_CLOSED; 309EIO_API int EIO_MONITOR_FILE_CLOSED;
310EAPI int EIO_MONITOR_DIRECTORY_CREATED; 310EIO_API int EIO_MONITOR_DIRECTORY_CREATED;
311EAPI int EIO_MONITOR_DIRECTORY_DELETED; 311EIO_API int EIO_MONITOR_DIRECTORY_DELETED;
312EAPI int EIO_MONITOR_DIRECTORY_MODIFIED; 312EIO_API int EIO_MONITOR_DIRECTORY_MODIFIED;
313EAPI int EIO_MONITOR_DIRECTORY_CLOSED; 313EIO_API int EIO_MONITOR_DIRECTORY_CLOSED;
314EAPI int EIO_MONITOR_SELF_RENAME; 314EIO_API int EIO_MONITOR_SELF_RENAME;
315EAPI int EIO_MONITOR_SELF_DELETED; 315EIO_API int EIO_MONITOR_SELF_DELETED;
316 316
317EAPI Eio_Monitor * 317EIO_API Eio_Monitor *
318eio_monitor_add(const char *path) 318eio_monitor_add(const char *path)
319{ 319{
320 const char *tmp; 320 const char *tmp;
@@ -327,7 +327,7 @@ eio_monitor_add(const char *path)
327 return ret; 327 return ret;
328} 328}
329 329
330EAPI Eio_Monitor * 330EIO_API Eio_Monitor *
331eio_monitor_stringshared_add(const char *path) 331eio_monitor_stringshared_add(const char *path)
332{ 332{
333 Eio_Monitor *monitor; 333 Eio_Monitor *monitor;
@@ -397,7 +397,7 @@ eio_monitor_stringshared_add(const char *path)
397 return monitor; 397 return monitor;
398} 398}
399 399
400EAPI void 400EIO_API void
401eio_monitor_del(Eio_Monitor *monitor) 401eio_monitor_del(Eio_Monitor *monitor)
402{ 402{
403 if (!monitor) return; 403 if (!monitor) return;
@@ -405,7 +405,7 @@ eio_monitor_del(Eio_Monitor *monitor)
405 _eio_monitor_free(monitor); 405 _eio_monitor_free(monitor);
406} 406}
407 407
408EAPI const char * 408EIO_API const char *
409eio_monitor_path_get(Eio_Monitor *monitor) 409eio_monitor_path_get(Eio_Monitor *monitor)
410{ 410{
411 EINA_SAFETY_ON_NULL_RETURN_VAL(monitor, NULL); 411 EINA_SAFETY_ON_NULL_RETURN_VAL(monitor, NULL);
@@ -413,7 +413,7 @@ eio_monitor_path_get(Eio_Monitor *monitor)
413} 413}
414 414
415 415
416EAPI Eina_Bool 416EIO_API Eina_Bool
417eio_monitor_has_context(const Eio_Monitor *monitor, const char *path) 417eio_monitor_has_context(const Eio_Monitor *monitor, const char *path)
418{ 418{
419 if (monitor->fallback) 419 if (monitor->fallback)
diff --git a/src/lib/eio/eio_monitor_poll.c b/src/lib/eio/eio_monitor_poll.c
index aae582f825..86b65aae5b 100644
--- a/src/lib/eio/eio_monitor_poll.c
+++ b/src/lib/eio/eio_monitor_poll.c
@@ -407,7 +407,7 @@ eio_monitor_fallback_del(Eio_Monitor *monitor)
407 *============================================================================*/ 407 *============================================================================*/
408 408
409 409
410EAPI void 410EIO_API void
411eio_monitoring_interval_set(double interval) 411eio_monitoring_interval_set(double interval)
412{ 412{
413 Eina_Iterator *it; 413 Eina_Iterator *it;
@@ -422,7 +422,7 @@ eio_monitoring_interval_set(double interval)
422 eina_iterator_free(it); 422 eina_iterator_free(it);
423} 423}
424 424
425EAPI Eina_Bool 425EIO_API Eina_Bool
426eio_monitor_fallback_check(const Eio_Monitor *monitor) 426eio_monitor_fallback_check(const Eio_Monitor *monitor)
427{ 427{
428 EINA_SAFETY_ON_NULL_RETURN_VAL(monitor, EINA_FALSE); 428 EINA_SAFETY_ON_NULL_RETURN_VAL(monitor, EINA_FALSE);
diff --git a/src/lib/eio/eio_single.c b/src/lib/eio/eio_single.c
index c0c21a5979..43475ca3d8 100644
--- a/src/lib/eio/eio_single.c
+++ b/src/lib/eio/eio_single.c
@@ -418,7 +418,7 @@ eio_file_container_set(Eio_File *common, void *container)
418 * API * 418 * API *
419 *============================================================================*/ 419 *============================================================================*/
420 420
421EAPI Eio_File * 421EIO_API Eio_File *
422eio_file_direct_stat(const char *path, 422eio_file_direct_stat(const char *path,
423 Eio_Stat_Cb done_cb, 423 Eio_Stat_Cb done_cb,
424 Eio_Error_Cb error_cb, 424 Eio_Error_Cb error_cb,
@@ -450,7 +450,7 @@ eio_file_direct_stat(const char *path,
450 return &s->common; 450 return &s->common;
451} 451}
452 452
453EAPI Eio_File * 453EIO_API Eio_File *
454eio_file_direct_lstat(const char *path, 454eio_file_direct_lstat(const char *path,
455 Eio_Stat_Cb done_cb, 455 Eio_Stat_Cb done_cb,
456 Eio_Error_Cb error_cb, 456 Eio_Error_Cb error_cb,
@@ -480,7 +480,7 @@ eio_file_direct_lstat(const char *path,
480 return &s->common; 480 return &s->common;
481} 481}
482 482
483EAPI Eio_File * 483EIO_API Eio_File *
484eio_file_unlink(const char *path, 484eio_file_unlink(const char *path,
485 Eio_Done_Cb done_cb, 485 Eio_Done_Cb done_cb,
486 Eio_Error_Cb error_cb, 486 Eio_Error_Cb error_cb,
@@ -509,7 +509,7 @@ eio_file_unlink(const char *path,
509 return &l->common; 509 return &l->common;
510} 510}
511 511
512EAPI Eio_File * 512EIO_API Eio_File *
513eio_file_mkdir(const char *path, 513eio_file_mkdir(const char *path,
514 mode_t mode, 514 mode_t mode,
515 Eio_Done_Cb done_cb, 515 Eio_Done_Cb done_cb,
@@ -540,7 +540,7 @@ eio_file_mkdir(const char *path,
540 return &r->common; 540 return &r->common;
541} 541}
542 542
543EAPI Eio_File * 543EIO_API Eio_File *
544eio_file_chmod(const char *path, 544eio_file_chmod(const char *path,
545 mode_t mode, 545 mode_t mode,
546 Eio_Done_Cb done_cb, 546 Eio_Done_Cb done_cb,
@@ -571,7 +571,7 @@ eio_file_chmod(const char *path,
571 return &r->common; 571 return &r->common;
572} 572}
573 573
574EAPI Eio_File * 574EIO_API Eio_File *
575eio_file_chown(const char *path, 575eio_file_chown(const char *path,
576 const char *user, 576 const char *user,
577 const char *group, 577 const char *group,
diff --git a/src/lib/eio/eio_xattr.c b/src/lib/eio/eio_xattr.c
index fdfb8990a6..484ecc120e 100644
--- a/src/lib/eio/eio_xattr.c
+++ b/src/lib/eio/eio_xattr.c
@@ -349,7 +349,7 @@ _eio_file_internal_xattr(const char *path,
349 return &async->ls.common; 349 return &async->ls.common;
350} 350}
351 351
352EAPI Eio_File * 352EIO_API Eio_File *
353eio_file_xattr(const char *path, 353eio_file_xattr(const char *path,
354 Eio_Filter_Cb filter_cb, 354 Eio_Filter_Cb filter_cb,
355 Eio_Main_Cb main_cb, 355 Eio_Main_Cb main_cb,
@@ -374,7 +374,7 @@ _eio_file_xattr(const char *path,
374 return _eio_file_internal_xattr(path, NULL, NULL, main_internal_cb, done_cb, error_cb, data); 374 return _eio_file_internal_xattr(path, NULL, NULL, main_internal_cb, done_cb, error_cb, data);
375} 375}
376 376
377EAPI Eio_File * 377EIO_API Eio_File *
378eio_file_xattr_get(const char *path, 378eio_file_xattr_get(const char *path,
379 const char *attribute, 379 const char *attribute,
380 Eio_Done_Data_Cb done_cb, 380 Eio_Done_Data_Cb done_cb,
@@ -397,7 +397,7 @@ eio_file_xattr_get(const char *path,
397 return _eio_file_xattr_setup_get(async, path, attribute, error_cb, data); 397 return _eio_file_xattr_setup_get(async, path, attribute, error_cb, data);
398} 398}
399 399
400EAPI Eio_File * 400EIO_API Eio_File *
401eio_file_xattr_string_get(const char *path, 401eio_file_xattr_string_get(const char *path,
402 const char *attribute, 402 const char *attribute,
403 Eio_Done_String_Cb done_cb, 403 Eio_Done_String_Cb done_cb,
@@ -420,7 +420,7 @@ eio_file_xattr_string_get(const char *path,
420 return _eio_file_xattr_setup_get(async, path, attribute, error_cb, data); 420 return _eio_file_xattr_setup_get(async, path, attribute, error_cb, data);
421} 421}
422 422
423EAPI Eio_File * 423EIO_API Eio_File *
424eio_file_xattr_double_get(const char *path, 424eio_file_xattr_double_get(const char *path,
425 const char *attribute, 425 const char *attribute,
426 Eio_Done_Double_Cb done_cb, 426 Eio_Done_Double_Cb done_cb,
@@ -443,7 +443,7 @@ eio_file_xattr_double_get(const char *path,
443 return _eio_file_xattr_setup_get(async, path, attribute, error_cb, data); 443 return _eio_file_xattr_setup_get(async, path, attribute, error_cb, data);
444} 444}
445 445
446EAPI Eio_File * 446EIO_API Eio_File *
447eio_file_xattr_int_get(const char *path, 447eio_file_xattr_int_get(const char *path,
448 const char *attribute, 448 const char *attribute,
449 Eio_Done_Int_Cb done_cb, 449 Eio_Done_Int_Cb done_cb,
@@ -466,7 +466,7 @@ eio_file_xattr_int_get(const char *path,
466 return _eio_file_xattr_setup_get(async, path, attribute, error_cb, data); 466 return _eio_file_xattr_setup_get(async, path, attribute, error_cb, data);
467} 467}
468 468
469EAPI Eio_File * 469EIO_API Eio_File *
470eio_file_xattr_set(const char *path, 470eio_file_xattr_set(const char *path,
471 const char *attribute, 471 const char *attribute,
472 const char *xattr_data, 472 const char *xattr_data,
@@ -496,7 +496,7 @@ eio_file_xattr_set(const char *path,
496 return _eio_file_xattr_setup_set(async, path, attribute, flags, done_cb, error_cb, data); 496 return _eio_file_xattr_setup_set(async, path, attribute, flags, done_cb, error_cb, data);
497} 497}
498 498
499EAPI Eio_File * 499EIO_API Eio_File *
500eio_file_xattr_string_set(const char *path, 500eio_file_xattr_string_set(const char *path,
501 const char *attribute, 501 const char *attribute,
502 const char *xattr_string, 502 const char *xattr_string,
@@ -531,7 +531,7 @@ eio_file_xattr_string_set(const char *path,
531 return _eio_file_xattr_setup_set(async, path, attribute, flags, done_cb, error_cb, data); 531 return _eio_file_xattr_setup_set(async, path, attribute, flags, done_cb, error_cb, data);
532} 532}
533 533
534EAPI Eio_File * 534EIO_API Eio_File *
535eio_file_xattr_double_set(const char *path, 535eio_file_xattr_double_set(const char *path,
536 const char *attribute, 536 const char *attribute,
537 double xattr_double, 537 double xattr_double,
@@ -556,7 +556,7 @@ eio_file_xattr_double_set(const char *path,
556 return _eio_file_xattr_setup_set(async, path, attribute, flags, done_cb, error_cb, data); 556 return _eio_file_xattr_setup_set(async, path, attribute, flags, done_cb, error_cb, data);
557} 557}
558 558
559EAPI Eio_File * 559EIO_API Eio_File *
560eio_file_xattr_int_set(const char *path, 560eio_file_xattr_int_set(const char *path,
561 const char *attribute, 561 const char *attribute,
562 int xattr_int, 562 int xattr_int,
diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build
index a5536cd90b..869f62b586 100644
--- a/src/lib/eio/meson.build
+++ b/src/lib/eio/meson.build
@@ -18,6 +18,7 @@ foreach eo_file : pub_eo_files
18 meson.current_build_dir(), eo_file + '.h'), 18 meson.current_build_dir(), eo_file + '.h'),
19 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 19 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
20 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 20 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
21 '-e', 'EIO_API',
21 '-gchd', '@INPUT@']) 22 '-gchd', '@INPUT@'])
22endforeach 23endforeach
23 24
@@ -72,7 +73,7 @@ eio_lib = library('eio',
72 dependencies: eio_deps + eio_pub_deps + eio_ext_deps, 73 dependencies: eio_deps + eio_pub_deps + eio_ext_deps,
73 include_directories : config_dir + [include_directories('.')], 74 include_directories : config_dir + [include_directories('.')],
74 install: true, 75 install: true,
75 c_args : package_c_args, 76 c_args : [package_c_args, '-DEIO_BUILD'],
76 link_args : linker_args, 77 link_args : linker_args,
77 version : meson.project_version() 78 version : meson.project_version()
78) 79)
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 01d4586b0e..a74bb3fe27 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -17,7 +17,7 @@
17#include "elm_priv.h" 17#include "elm_priv.h"
18#include "eo_internal.h" 18#include "eo_internal.h"
19#include <Elementary.h> 19#include <Elementary.h>
20#include "Eio_Eo.h" 20#include "Eio.h"
21#include "elm_fileselector_button_eo.h" 21#include "elm_fileselector_button_eo.h"
22#include "elm_fileselector_entry_eo.h" 22#include "elm_fileselector_entry_eo.h"
23#include "elm_interface_fileselector.h" 23#include "elm_interface_fileselector.h"
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 5e10e83063..e05fc4e181 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -5,7 +5,7 @@
5#define EFL_ACCESS_OBJECT_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "Eio_Eo.h" 8#include "Eio.h"
9#include "elm_priv.h" 9#include "elm_priv.h"
10#include "elm_fileselector_button_eo.h" 10#include "elm_fileselector_button_eo.h"
11#include "elm_fileselector_entry_eo.h" 11#include "elm_fileselector_entry_eo.h"
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index ff37e5b1d0..f67990aadb 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -7,7 +7,7 @@
7#define EFL_PART_PROTECTED 7#define EFL_PART_PROTECTED
8 8
9#include <Elementary.h> 9#include <Elementary.h>
10#include "Eio_Eo.h" 10#include "Eio.h"
11#include "elm_priv.h" 11#include "elm_priv.h"
12#include "elm_fileselector_button_eo.h" 12#include "elm_fileselector_button_eo.h"
13#include "elm_fileselector_entry_eo.h" 13#include "elm_fileselector_entry_eo.h"
diff --git a/src/lib/elementary/elm_interface_fileselector.c b/src/lib/elementary/elm_interface_fileselector.c
index 98d6552c70..bec043a88f 100644
--- a/src/lib/elementary/elm_interface_fileselector.c
+++ b/src/lib/elementary/elm_interface_fileselector.c
@@ -4,7 +4,7 @@
4 4
5 5
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "Eio_Eo.h" 7#include "Eio.h"
8 8
9#include "elm_interface_fileselector.h" 9#include "elm_interface_fileselector.h"
10 10