merge: eio + fix compilation on windows + minor fixes + po files

don't move eio to IN-EFL right now


SVN revision: 80180

37 files changed, 332 insertions, 92 deletions

diff --git a/AUTHORS b/AUTHORS
index e96759ccb3..c1c1ee953e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -189,3 +189,15 @@ Embryo
 
 The Rasterman (Carsten Haitzler) <raster@rasterman.com>
 Jérôme Pinot <ngc891@gmail.com>
+
+Eio
+---
+
+Cedric Bail <cedric.bail@free.fr>
+Stephen Houston <UnixTitan@gmail.com>
+Gustavo Sverzut Barbieri <barbieri@gmail.com>
+Vincent "caro" Torri <vtorri at univ-evry dot fr>
+Mikael SANS <sans.mikael@gmail.com>
+Mike Blumenkrantz (zmike/discomfitor) <michael.blumenkrantz@gmail.com>
+Jérôme Pinot <ngc891@gmail.com>
+Daniel Willmann <d.willmann@samsung.com>
diff --git a/Makefile.am b/Makefile.am
index b59b22074f..0cca9c24c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,10 @@ m4/eina_check.m4 \
 m4/eina_config.m4 \
 m4/evas_check_engine.m4 \
 m4/evas_check_loader.m4 \
-m4/evas_dither.m4
+m4/evas_dither.m4 \
+m4/ecore_check_c_extension.m4 \
+m4/ecore_check_module.m4 \
+m4/eio_check_options.m4
 
 EXTRA_DIST += \
 autogen.sh \
@@ -93,7 +96,8 @@ pc/ecore-x.pc \
 pc/ecore-imf.pc \
 pc/ecore-imf-evas.pc \
 pc/ecore-evas.pc \
-pc/embryo.pc
+pc/embryo.pc \
+pc/eio.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
@@ -120,7 +124,8 @@ pc/ecore-input-evas.pc \
 pc/ecore-imf.pc \
 pc/ecore-imf-evas.pc \
 pc/ecore-evas.pc \
-pc/embryo.pc
+pc/embryo.pc \
+pc/eio.pc
 
 if BUILD_ENGINE_SOFTWARE_X11
 pkgconfig_DATA += pc/evas-software-x11.pc
diff --git a/configure.ac b/configure.ac
index d973639cfd..b7d0254adb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,7 @@ requirements_libs_ecore_wince=""
 requirements_libs_ecore_x=""
 requirements_libs_ecore_evas=""
 requirements_libs_embryo=""
-#requirements_libs_eio=""
+requirements_libs_eio=""
 #requirements_libs_edje=""
 #requirements_libs_efreet=""
 #requirements_libs_e_dbus=""
@@ -139,7 +139,7 @@ requirements_pc_ecore_wince=""
 requirements_pc_ecore_x=""
 requirements_pc_ecore_evas=""
 requirements_pc_embryo=""
-#requirements_pc_eio=""
+requirements_pc_eio=""
 #requirements_pc_edje=""
 #requirements_pc_efreet=""
 #requirements_pc_e_dbus=""
@@ -159,7 +159,6 @@ requirements_pc_deps_ecore_sdl=""
 requirements_pc_deps_ecore_wayland=""
 requirements_pc_deps_ecore_evas=""
 requirements_pc_deps_embryo=""
-#requirements_pc_deps_eio=""
 #requirements_pc_deps_edje=""
 #requirements_pc_deps_efreet=""
 #requirements_pc_deps_e_dbus=""
@@ -189,7 +188,7 @@ AC_SUBST([requirements_libs_ecore_wince])
 AC_SUBST([requirements_libs_ecore_x])
 AC_SUBST([requirements_libs_ecore_evas])
 AC_SUBST([requirements_libs_embryo])
-#AC_SUBST([requirements_libs_eio])
+AC_SUBST([requirements_libs_eio])
 #AC_SUBST([requirements_libs_edje])
 #AC_SUBST([requirements_libs_efreet])
 #AC_SUBST([requirements_libs_e_dbus])
@@ -219,7 +218,7 @@ AC_SUBST([requirements_pc_ecore_wince])
 AC_SUBST([requirements_pc_ecore_x])
 AC_SUBST([requirements_pc_ecore_evas])
 AC_SUBST([requirements_pc_embryo])
-#AC_SUBST([requirements_pc_eio])
+AC_SUBST([requirements_pc_eio])
 #AC_SUBST([requirements_pc_edje])
 #AC_SUBST([requirements_pc_efreet])
 #AC_SUBST([requirements_pc_e_dbus])
@@ -3770,6 +3769,7 @@ AC_MSG_NOTICE([Ecore_Evas checks])
 ### Default values
 
 have_ecore_evas="yes"
+have_extn="yes"
 
 want_ecore_evas_software_buffer="yes"
 want_ecore_evas_software_x11="no"
@@ -3796,6 +3796,7 @@ case "$host_os" in
       want_ecore_evas_software_ddraw="yes"
       want_ecore_evas_software_sdl="yes"
       want_ecore_evas_gl_sdl="yes"
+      want_ecore_evas_extn="no"
       ;;
    darwin*)
       want_ecore_evas_software_sdl="yes"
@@ -3862,10 +3863,10 @@ ECORE_EVAS_CHECK_MODULE_FULL([ews],
 
 # ecore_evas_extn
 
-have_extn="yes"
 if test "x${have_ecore_ipc}" = "xno" || \
    test "x${have_ecore_evas_software_buffer}" = "xno" || \
-   test "x${have_shm_open}" = "xno" ; then
+   test "x${have_shm_open}" = "xno" || \
+   test "x${have_windows}" = "xyes" ; then
    have_extn="no"
 fi
 
@@ -4049,6 +4050,116 @@ fi
 #### End of Ecore_Evas
 
 
+#### Eio
+
+AC_MSG_NOTICE([Eio checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+requirements_pc_eio="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_eio}"
+
+### Checks for header files
+
+AC_CHECK_HEADERS([grp.h pwd.h])
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+AC_CHECK_FUNCS([fchmod chown getpwnam getgrnam])
+
+# Check for splice system call
+
+AC_MSG_CHECKING([whether to use splice for file copy])
+AC_TRY_LINK(
+   [
+#if defined(HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+#include <fcntl.h>
+   ],
+   [
+long ret = splice(0,0,1,0,400,0);
+   ],
+   [have_splice="yes"],
+   [have_splice="no"])
+AC_MSG_RESULT([${have_splice}])
+
+if test "x${have_splice}" = "xyes" ; then
+   AC_DEFINE([HAVE_SPLICE], [1], [Define to mention that splice syscall is supported])
+fi
+
+# Check for lstat
+
+AC_MSG_CHECKING([whether lstat is available])
+AC_TRY_LINK(
+   [
+#include <sys/types.h>
+#include <sys/stat.h>
+#if defined(HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+   ],
+   [
+struct stat st;
+lstat("/tmp", &st);
+   ],
+   [have_lstat="yes"],
+   [have_lstat="no"])
+AC_MSG_RESULT([${have_lstat}])
+
+if test "x${have_lstat}" = "xyes" ; then
+   AC_DEFINE([HAVE_LSTAT], [1], [Define to mention that lstat syscall is supported])
+fi
+
+# extended attribute
+
+AC_MSG_CHECKING([for extended attributes])
+
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/xattr.h>
+       ]],
+       [[
+size_t tmp = listxattr("/", NULL, 0);
+tmp = getxattr("/", "user.ethumb.md5", NULL, 0);
+setxattr("/", "user.ethumb.md5", NULL, 0, 0);
+       ]])],
+   [
+    AC_DEFINE([HAVE_XATTR], [1], [Define to 1 if you have the `listxattr', `setxattr' and `getxattr' functions.])
+    have_xattr="yes"
+   ],
+   [have_xattr="no"])
+
+AC_MSG_RESULT([${have_xattr}])
+
+# Check for inotify specificity
+have_inotify="no"
+have_notify_win32="no"
+EIO_CHECK_INOTIFY([have_inotify="yes"], [have_inotify="no"])
+EIO_CHECK_NOTIFY_WIN32([have_notify_win32="yes"], [have_notify_win32="no"])
+
+AM_CONDITIONAL([EIO_HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
+AM_CONDITIONAL([EIO_HAVE_WINCHANGE], [test "x${have_notify_win32}" = "xyes"])
+
+#### End of Eio
+
+
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -4104,6 +4215,7 @@ pc/ecore-evas.pc
 pc/ecore-imf.pc
 pc/ecore-imf-evas.pc
 pc/embryo.pc
+pc/eio.pc
 $po_makefile_in
 ])
 
@@ -4327,6 +4439,10 @@ echo "  Ecore_Evas...................: $have_ecore_evas"
   echo "    Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
 #fi
 echo
+echo "Eio"
+echo "  Inotify..............: ${have_inotify}"
+echo "  Windows notification.: ${have_notify_win32}"
+echo
 echo "Tests..................: ${_efl_enable_tests}"
 if test "x${_efl_enable_tests}" = "xyes"; then
 echo "    Coverage...........: ${_efl_enable_coverage}"
diff --git a/m4/eio_check_options.m4 b/m4/eio_check_options.m4
new file mode 100644
index 0000000000..485dd85595
--- /dev/null
+++ b/m4/eio_check_options.m4
@@ -0,0 +1,56 @@
+dnl use: EIO_CHECK_INOTIFY([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([EIO_CHECK_INOTIFY],
+[
+_eio_have_inotify="no"
+
+dnl We need to check if the right inotify version is accessible
+
+dnl It is hard to find a good test on how to check the correct
+dnl inotify version. They changed the headers a lot.
+dnl in kernel 2.6.13 __NR_inotify_init was added to the defined syscalls
+dnl in asm/unistd.h and IN_MOVE_SELF was added to linux/inotify.h
+dnl so with this check you need a very new kernel and kernel-headers!
+
+if ! test "x${have_windows}" = "xyes" ; then
+
+   AC_CHECK_LIB([c], [inotify_init],
+      [
+       AC_DEFINE([HAVE_INOTIFY], [1], [ File monitoring with Inotify ])
+       AC_DEFINE([HAVE_SYS_INOTIFY], [1], [ File monitoring with Inotify - sys/inotify.h ])
+       _eio_have_inotify="yes"
+      ],
+      [
+       AC_TRY_COMPILE(
+          [
+#include <asm/unistd.h>
+#include <linux/inotify.h>
+          ],
+          [
+int a = __NR_inotify_init; int b = IN_MOVE_SELF;
+          ],
+          [
+           AC_DEFINE([HAVE_INOTIFY], [1], [ File monitoring with Inotify ])
+           _eio_have_inotify="yes"
+          ],
+          [_eio_have_inotify="no"])
+      ])
+fi
+
+AC_MSG_CHECKING([whether inotify is to be used for filemonitoring])
+AC_MSG_RESULT([${_eio_have_inotify}])
+
+AS_IF([test "x${_eio_have_inotify}" = "xyes"], [$1], [$2])
+])
+
+dnl use: EIO_CHECK_NOTIFY_WIN32([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([EIO_CHECK_NOTIFY_WIN32],
+[
+if test "x${have_win32}" = "xyes" ; then
+   AC_DEFINE([HAVE_NOTIFY_WIN32], [1], [ File monitoring with Windows notification ])
+fi
+
+AC_MSG_CHECKING([whether Windows notification is to be used for filemonitoring])
+AC_MSG_RESULT([${have_win32}])
+
+AS_IF([test "x${have_win32}" = "xyes"], [$1], [$2])
+])
diff --git a/legacy/eio/ChangeLog b/old/ChangeLog.eio
index 71acd0c332..71acd0c332 100644
--- a/legacy/eio/ChangeLog
+++ b/old/ChangeLog.eio
diff --git a/legacy/eio/NEWS b/old/NEWS.eio
index 1fddc650e1..1fddc650e1 100644
--- a/legacy/eio/NEWS
+++ b/old/NEWS.eio
diff --git a/legacy/eio/README b/old/README.eio
index a59326ab12..a59326ab12 100644
--- a/legacy/eio/README
+++ b/old/README.eio
diff --git a/legacy/eio/eio.pc.in b/pc/eio.pc.in
index 24e409b824..24e409b824 100644
--- a/legacy/eio/eio.pc.in
+++ b/pc/eio.pc.in
diff --git a/po/cs.po b/po/cs.po
index 71c84e0880..810cb1c4fd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2011-10-23 01:28+0100\n"
 "Last-Translator: Daniel Kolesa <quaker66@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
diff --git a/po/de.po b/po/de.po
index 50c5f5abe1..aafdf383fc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore 0.9.9.063-2\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2010-01-03 21:52+GMT\n"
 "Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/po/el.po b/po/el.po
index 911b309122..30c15c775f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2012-12-01 18:25+0200\n"
 "Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
 "Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el@opensuse.org>\n"
diff --git a/po/eo.po b/po/eo.po
index b07fc825df..b15233be7a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2012-09-27 14:49+0000\n"
 "Last-Translator: Michael Moroni <michael.moroni@mailoo.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 6bc850c796..8a19414ec7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2012-11-08 02:06+0100\n"
 "Last-Translator: Aníbal Garrido <khany@member.trisquel.info>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/fr.po b/po/fr.po
index 57064f246e..e119baf231 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2010-07-11 11:01+0400\n"
 "Last-Translator: batden <batden@orange.fr>\n"
 "Language-Team: Enlightenment French Team <pourunmondesansgourou@gmail.com>\n"
diff --git a/po/gl.po b/po/gl.po
index 41edae2792..ef34a5a703 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2012-10-16 09:53+0200\n"
 "Last-Translator: Aníbal Garrido <khany@member.trisquel.info>\n"
 "Language-Team: http://trasno.net/ <proxecto@trasno.net>\n"
diff --git a/po/it.po b/po/it.po
index f4a983e713..db00f7820e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2009-10-27 19:36+0100\n"
 "Last-Translator: quaker66 <quaker66@gmail.com>\n"
 "Language-Team: none\n"
diff --git a/po/ko.po b/po/ko.po
index 80557491de..b6ffa6bf66 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment Ecore 1.7.0\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2012-08-30 22:50+0900\n"
 "Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
 "Language-Team: Enlightenment-Intl <enlightenment-intl@lists.sourceforge."
diff --git a/po/nl.po b/po/nl.po
index ba9d4e34a8..83e4a41d99 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2011-09-03 15:48+0100\n"
 "Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
 "Language-Team:  <vistausss@gmail.com>\n"
diff --git a/po/pt.po b/po/pt.po
index fe97eebe86..fdc8efbd99 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2012-08-23 00:30+0100\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: \n"
diff --git a/po/sl.po b/po/sl.po
index c42029b87b..49b23e8cbe 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore 1.0\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-03 22:08+0100\n"
+"POT-Creation-Date: 2012-12-04 18:30+0100\n"
 "PO-Revision-Date: 2011-02-24 16:54+0100\n"
 "Last-Translator: r1to <renato.rener@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d2ae9e9c7..73ac3a9048 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,6 +56,7 @@ endif
 include Makefile_Ecore_Imf.am
 include Makefile_Ecore_Evas.am
 include Makefile_Embryo.am
+include Makefile_Eio.am
 
 .PHONY: benchmark examples
 
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index f38c31ae84..40036b753d 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -107,10 +107,10 @@ if HAVE_WIN32
 lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
 -I$(top_srcdir)/src/lib/ecore_win32 \
 -I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
--I$(top_srcdir)/src/modules/evas/engines/direct3d \
+-I$(top_srcdir)/src/modules/evas/engines/software_gdi \
 -I$(top_builddir)/src/lib/ecore_win32 \
 -I$(top_builddir)/src/modules/evas/engines/software_ddraw \
--I$(top_builddir)/src/modules/evas/engines/direct3d
+-I$(top_builddir)/src/modules/evas/engines/software_gdi
 endif
 
 if HAVE_WINCE
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
new file mode 100644
index 0000000000..93f4d25f93
--- /dev/null
+++ b/src/Makefile_Eio.am
@@ -0,0 +1,50 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/eio/libeio.la
+
+installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@
+dist_installed_eiomainheaders_DATA = lib/eio/Eio.h lib/eio/eio_inline_helper.x
+
+lib_eio_libeio_la_SOURCES = \
+lib/eio/eio_dir.c \
+lib/eio/eio_eet.c \
+lib/eio/eio_file.c \
+lib/eio/eio_main.c \
+lib/eio/eio_map.c \
+lib/eio/eio_monitor.c \
+lib/eio/eio_monitor_poll.c \
+lib/eio/eio_single.c \
+lib/eio/eio_xattr.c \
+lib/eio/eio_private.h
+
+if EIO_HAVE_INOTIFY
+lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_inotify.c
+else
+if EIO_HAVE_WINCHANGE
+lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_win32.c
+endif
+endif
+
+lib_eio_libeio_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/eio \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/eio \
+-DEFL_EIO_BUILD \
+@EFL_CFLAGS@
+
+lib_eio_libeio_la_LIBADD = \
+lib/eina/libeina.la \
+lib/eo/libeo.la \
+lib/eet/libeet.la \
+lib/ecore/libecore.la \
+-lm
+
+lib_eio_libeio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/legacy/eio/src/lib/Eio.h b/src/lib/eio/Eio.h
index cb791a0ebf..cb791a0ebf 100644
--- a/legacy/eio/src/lib/Eio.h
+++ b/src/lib/eio/Eio.h
diff --git a/legacy/eio/src/lib/eio_dir.c b/src/lib/eio/eio_dir.c
index 7bed4fb858..71cc3a0540 100644
--- a/legacy/eio/src/lib/eio_dir.c
+++ b/src/lib/eio/eio_dir.c
@@ -441,7 +441,7 @@ _eio_dir_copy_heavy(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_dir_copy_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
+_eio_dir_copy_notify(void *data, Ecore_Thread *thread EINA_UNUSED, void *msg_data)
 {
    Eio_Dir_Copy *copy = data;
    Eio_Progress *progress = msg_data;
@@ -458,7 +458,7 @@ _eio_dir_copy_free(Eio_Dir_Copy *copy)
 }
 
 static void
-_eio_dir_copy_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_dir_copy_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Dir_Copy *copy = data;
 
@@ -468,7 +468,7 @@ _eio_dir_copy_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_dir_copy_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_dir_copy_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Dir_Copy *copy = data;
 
@@ -748,7 +748,7 @@ _eio_dir_direct_find_heavy(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_dir_stat_find_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
+_eio_dir_stat_find_notify(void *data, Ecore_Thread *thread EINA_UNUSED, void *msg_data)
 {
    Eio_File_Dir_Ls *async = data;
    Eina_List *pack = msg_data;
@@ -771,7 +771,7 @@ _eio_dir_stat_find_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg
 }
 
 static void
-_eio_dir_stat_done(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_dir_stat_done(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Ls *async = data;
 
@@ -781,7 +781,7 @@ _eio_dir_stat_done(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_dir_stat_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_dir_stat_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Ls *async = data;
 
diff --git a/legacy/eio/src/lib/eio_eet.c b/src/lib/eio/eio_eet.c
index 049c1e39a9..c25cc4a035 100644
--- a/legacy/eio/src/lib/eio_eet.c
+++ b/src/lib/eio/eio_eet.c
@@ -47,7 +47,7 @@ _eio_eet_open_free(Eio_Eet_Open *eet)
 }
 
 static void
-_eio_eet_open_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_open_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Open *eet = data;
 
@@ -56,7 +56,7 @@ _eio_eet_open_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_eet_open_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_open_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Open *eet = data;
 
@@ -83,7 +83,7 @@ _eio_eet_sync_job(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_eet_simple_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_simple_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Simple *eet = data;
 
@@ -92,7 +92,7 @@ _eio_eet_simple_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_eet_simple_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_simple_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Simple *eet = data;
 
@@ -121,7 +121,7 @@ _eio_eet_write_cipher_free(Eio_Eet_Write *ew)
 }
 
 static void
-_eio_eet_data_write_cipher_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_data_write_cipher_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Write *ew = data;
 
@@ -130,7 +130,7 @@ _eio_eet_data_write_cipher_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_eet_data_write_cipher_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_data_write_cipher_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Write *ew = data;
 
@@ -163,7 +163,7 @@ _eio_eet_image_write_free(Eio_Eet_Image_Write *eiw)
 }
 
 static void
-_eio_eet_image_write_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_image_write_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Image_Write *eiw = data;
 
@@ -172,7 +172,7 @@ _eio_eet_image_write_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_eet_image_write_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_image_write_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Image_Write *eiw = data;
 
@@ -193,7 +193,7 @@ _eio_eet_write_job(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_eet_write_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_write_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Write *ew = data;
 
@@ -202,7 +202,7 @@ _eio_eet_write_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_eet_write_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_write_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Write *ew = data;
 
@@ -229,7 +229,7 @@ _eio_eet_read_free(Eio_Eet_Read *er)
 }
 
 static void
-_eio_eet_data_read_cipher_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_data_read_cipher_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Read *er = data;
 
@@ -238,7 +238,7 @@ _eio_eet_data_read_cipher_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_eet_data_read_cipher_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_data_read_cipher_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Read *er = data;
 
@@ -256,7 +256,7 @@ _eio_eet_read_direct_job(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_eet_read_direct_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_read_direct_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Read *er = data;
 
@@ -266,7 +266,7 @@ _eio_eet_read_direct_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_eet_read_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_read_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Read *er = data;
 
@@ -285,7 +285,7 @@ _eio_eet_read_cipher_job(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_eet_read_cipher_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_eet_read_cipher_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Eet_Read *er = data;
 
diff --git a/legacy/eio/src/lib/eio_file.c b/src/lib/eio/eio_file.c
index 31122d0c1f..ffcd2a73ad 100644
--- a/legacy/eio/src/lib/eio_file.c
+++ b/src/lib/eio/eio_file.c
@@ -108,7 +108,7 @@ _eio_file_heavy(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_file_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
+_eio_file_notify(void *data, Ecore_Thread *thread EINA_UNUSED, void *msg_data)
 {
    Eio_File_Char_Ls *async = data;
    Eina_List *pack = msg_data;
@@ -220,7 +220,7 @@ _eio_file_stat_heavy(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_file_direct_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
+_eio_file_direct_notify(void *data, Ecore_Thread *thread EINA_UNUSED, void *msg_data)
 {
    Eio_File_Direct_Ls *async = data;
    Eina_List *pack = msg_data;
@@ -245,8 +245,8 @@ _eio_file_direct_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_d
 }
 
 static void
-_eio_eina_file_copy_xattr(Ecore_Thread *thread __UNUSED__,
-			  Eio_File_Progress *op __UNUSED__,
+_eio_eina_file_copy_xattr(Ecore_Thread *thread EINA_UNUSED,
+			  Eio_File_Progress *op EINA_UNUSED,
 			  Eina_File *f, int out)
 {
    Eina_Iterator *it;
@@ -264,8 +264,8 @@ _eio_eina_file_copy_xattr(Ecore_Thread *thread __UNUSED__,
 
 #ifdef HAVE_XATTR
 static void
-_eio_file_copy_xattr(Ecore_Thread *thread __UNUSED__,
-                     Eio_File_Progress *op __UNUSED__,
+_eio_file_copy_xattr(Ecore_Thread *thread EINA_UNUSED,
+                     Eio_File_Progress *op EINA_UNUSED,
                      int in, int out)
 {
    char *tmp;
@@ -417,7 +417,7 @@ _eio_file_copy_heavy(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_file_copy_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
+_eio_file_copy_notify(void *data, Ecore_Thread *thread EINA_UNUSED, void *msg_data)
 {
    Eio_File_Progress *copy = data;
 
@@ -433,7 +433,7 @@ _eio_file_copy_free(Eio_File_Progress *copy)
 }
 
 static void
-_eio_file_copy_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_copy_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Progress *copy = data;
 
@@ -443,7 +443,7 @@ _eio_file_copy_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_copy_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_copy_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Progress *copy = data;
 
@@ -461,7 +461,7 @@ _eio_file_move_free(Eio_File_Move *move)
 }
 
 static void
-_eio_file_move_copy_progress(void *data, Eio_File *handler __UNUSED__, const Eio_Progress *info)
+_eio_file_move_copy_progress(void *data, Eio_File *handler EINA_UNUSED, const Eio_Progress *info)
 {
    Eio_File_Move *move = data;
 
@@ -469,7 +469,7 @@ _eio_file_move_copy_progress(void *data, Eio_File *handler __UNUSED__, const Eio
 }
 
 static void
-_eio_file_move_unlink_done(void *data, Eio_File *handler __UNUSED__)
+_eio_file_move_unlink_done(void *data, Eio_File *handler EINA_UNUSED)
 {
    Eio_File_Move *move = data;
 
@@ -479,7 +479,7 @@ _eio_file_move_unlink_done(void *data, Eio_File *handler __UNUSED__)
 }
 
 static void
-_eio_file_move_unlink_error(void *data, Eio_File *handler __UNUSED__, int error)
+_eio_file_move_unlink_error(void *data, Eio_File *handler EINA_UNUSED, int error)
 {
    Eio_File_Move *move = data;
 
@@ -492,7 +492,7 @@ _eio_file_move_unlink_error(void *data, Eio_File *handler __UNUSED__, int error)
 }
 
 static void
-_eio_file_move_copy_done(void *data, Eio_File *handler __UNUSED__)
+_eio_file_move_copy_done(void *data, Eio_File *handler EINA_UNUSED)
 {
    Eio_File_Move *move = data;
    Eio_File *rm;
@@ -505,7 +505,7 @@ _eio_file_move_copy_done(void *data, Eio_File *handler __UNUSED__)
 }
 
 static void
-_eio_file_move_copy_error(void *data, Eio_File *handler __UNUSED__, int error)
+_eio_file_move_copy_error(void *data, Eio_File *handler EINA_UNUSED, int error)
 {
    Eio_File_Move *move = data;
 
@@ -527,7 +527,7 @@ _eio_file_move_heavy(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_file_move_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
+_eio_file_move_notify(void *data, Ecore_Thread *thread EINA_UNUSED, void *msg_data)
 {
    Eio_File_Move *move = data;
 
@@ -535,7 +535,7 @@ _eio_file_move_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_dat
 }
 
 static void
-_eio_file_move_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_move_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Move *move = data;
 
@@ -545,7 +545,7 @@ _eio_file_move_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_move_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_move_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Move *move = data;
 
@@ -710,7 +710,7 @@ eio_async_free(Eio_File_Ls *async)
 }
 
 void
-eio_async_end(void *data, Ecore_Thread *thread __UNUSED__)
+eio_async_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Ls *async = data;
 
@@ -720,7 +720,7 @@ eio_async_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 void
-eio_async_error(void *data, Ecore_Thread *thread __UNUSED__)
+eio_async_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Ls *async = data;
 
diff --git a/legacy/eio/src/lib/eio_inline_helper.x b/src/lib/eio/eio_inline_helper.x
index af49646b72..af49646b72 100644
--- a/legacy/eio/src/lib/eio_inline_helper.x
+++ b/src/lib/eio/eio_inline_helper.x
diff --git a/legacy/eio/src/lib/eio_main.c b/src/lib/eio/eio_main.c
index e65f75b0da..e65f75b0da 100644
--- a/legacy/eio/src/lib/eio_main.c
+++ b/src/lib/eio/eio_main.c
diff --git a/legacy/eio/src/lib/eio_map.c b/src/lib/eio/eio_map.c
index 9edc0adebf..8efa48c8f2 100644
--- a/legacy/eio/src/lib/eio_map.c
+++ b/src/lib/eio/eio_map.c
@@ -48,7 +48,7 @@ _eio_file_open_free(Eio_File_Map *map)
 }
 
 static void
-_eio_file_open_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_open_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Map *map = data;
 
@@ -57,7 +57,7 @@ _eio_file_open_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_open_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_open_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Map *map = data;
 
@@ -66,7 +66,7 @@ _eio_file_open_cancel(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_close_job(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_close_job(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Map *map = data;
 
@@ -74,7 +74,7 @@ _eio_file_close_job(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_close_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_close_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Map *map = data;
 
@@ -83,7 +83,7 @@ _eio_file_close_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_close_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_close_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Map *map = data;
 
@@ -139,7 +139,7 @@ _eio_file_map_new_job(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_file_map_end(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_map_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Map_Rule *map = data;
 
@@ -148,7 +148,7 @@ _eio_file_map_end(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_map_cancel(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_map_cancel(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Map_Rule *map = data;
 
diff --git a/legacy/eio/src/lib/eio_monitor.c b/src/lib/eio/eio_monitor.c
index 9f735d63c6..0b4df98945 100644
--- a/legacy/eio/src/lib/eio_monitor.c
+++ b/src/lib/eio/eio_monitor.c
@@ -52,7 +52,7 @@ _eio_monitor_free(Eio_Monitor *monitor)
 }
 
 static void
-_eio_monitor_error_cleanup_cb(__UNUSED__ void *user_data, void *func_data)
+_eio_monitor_error_cleanup_cb(EINA_UNUSED void *user_data, void *func_data)
 {
    Eio_Monitor_Error *ev = func_data;
 
@@ -62,7 +62,7 @@ _eio_monitor_error_cleanup_cb(__UNUSED__ void *user_data, void *func_data)
 }
 
 static void
-_eio_monitor_event_cleanup_cb(__UNUSED__ void *user_data, void *func_data)
+_eio_monitor_event_cleanup_cb(EINA_UNUSED void *user_data, void *func_data)
 {
    Eio_Monitor_Event *ev = func_data;
 
@@ -73,7 +73,7 @@ _eio_monitor_event_cleanup_cb(__UNUSED__ void *user_data, void *func_data)
 }
 
 static void
-_eio_monitor_stat_cb(void *data, __UNUSED__ Eio_File *handler, __UNUSED__ const Eina_Stat *st)
+_eio_monitor_stat_cb(void *data, EINA_UNUSED Eio_File *handler, EINA_UNUSED const Eina_Stat *st)
 {
    Eio_Monitor *monitor = data;
 
@@ -102,7 +102,7 @@ _eio_monitor_error(Eio_Monitor *monitor, int error)
 }
 
 static void
-_eio_monitor_error_cb(void *data, Eio_File *handler __UNUSED__, int error)
+_eio_monitor_error_cb(void *data, Eio_File *handler EINA_UNUSED, int error)
 {
    Eio_Monitor *monitor = data;
 
diff --git a/legacy/eio/src/lib/eio_monitor_inotify.c b/src/lib/eio/eio_monitor_inotify.c
index b5ffabd81c..66abe9c1df 100644
--- a/legacy/eio/src/lib/eio_monitor_inotify.c
+++ b/src/lib/eio/eio_monitor_inotify.c
@@ -138,7 +138,7 @@ _eio_inotify_events(Eio_Monitor_Backend *backend, const char *file, int mask)
 }
 
 static Eina_Bool
-_eio_inotify_handler(void *data __UNUSED__, Ecore_Fd_Handler *fdh)
+_eio_inotify_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fdh)
 {
    Eio_Monitor_Backend *backend;
    unsigned char buffer[16384];
diff --git a/legacy/eio/src/lib/eio_monitor_poll.c b/src/lib/eio/eio_monitor_poll.c
index 1f09a427d5..4cd7d1ad78 100644
--- a/legacy/eio/src/lib/eio_monitor_poll.c
+++ b/src/lib/eio/eio_monitor_poll.c
@@ -212,7 +212,7 @@ _eio_monitor_fallback_heavy_cb(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_monitor_fallback_end_cb(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_monitor_fallback_end_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Monitor_Backend *backend = data;
 
@@ -221,7 +221,7 @@ _eio_monitor_fallback_end_cb(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_monitor_fallback_cancel_cb(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_monitor_fallback_cancel_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_Monitor_Backend *backend = data;
 
diff --git a/legacy/eio/src/lib/eio_monitor_win32.c b/src/lib/eio/eio_monitor_win32.c
index 16dbaa7fdd..50404e230e 100644
--- a/legacy/eio/src/lib/eio_monitor_win32.c
+++ b/src/lib/eio/eio_monitor_win32.c
@@ -59,7 +59,7 @@ struct _Eio_Monitor_Backend
 static Eina_Bool _eio_monitor_win32_native = EINA_FALSE;
 
 static Eina_Bool
-_eio_monitor_win32_cb(void *data, Ecore_Win32_Handler *wh __UNUSED__)
+_eio_monitor_win32_cb(void *data, Ecore_Win32_Handler *wh EINA_UNUSED)
 {
    PFILE_NOTIFY_INFORMATION   fni;
    Eio_Monitor_Win32_Watcher *w;
diff --git a/legacy/eio/src/lib/eio_private.h b/src/lib/eio/eio_private.h
index d57277e9c2..d57277e9c2 100644
--- a/legacy/eio/src/lib/eio_private.h
+++ b/src/lib/eio/eio_private.h
diff --git a/legacy/eio/src/lib/eio_single.c b/src/lib/eio/eio_single.c
index 8bc99fa41e..d80dd840e6 100644
--- a/legacy/eio/src/lib/eio_single.c
+++ b/src/lib/eio/eio_single.c
@@ -46,7 +46,7 @@ _eio_mkdir_free(Eio_File_Mkdir *m)
 }
 
 static void
-_eio_file_mkdir_done(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_mkdir_done(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Mkdir *m = data;
 
@@ -57,7 +57,7 @@ _eio_file_mkdir_done(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_mkdir_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_mkdir_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Mkdir *m = data;
 
@@ -82,7 +82,7 @@ _eio_unlink_free(Eio_File_Unlink *l)
 }
 
 static void
-_eio_file_unlink_done(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_unlink_done(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Unlink *l = data;
 
@@ -93,7 +93,7 @@ _eio_file_unlink_done(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_unlink_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_unlink_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Unlink *l = data;
 
@@ -173,7 +173,7 @@ _eio_stat_free(Eio_File_Stat *s)
 }
 
 static void
-_eio_file_stat_done(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_stat_done(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Stat *s = data;
 
@@ -184,7 +184,7 @@ _eio_file_stat_done(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_stat_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_stat_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Stat *s = data;
 
@@ -276,7 +276,7 @@ _eio_chown_free(Eio_File_Chown *ch)
 }
 
 static void
-_eio_file_chown_done(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_chown_done(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Chown *ch = data;
 
@@ -287,7 +287,7 @@ _eio_file_chown_done(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_chown_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_chown_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Chown *ch = data;
 
diff --git a/legacy/eio/src/lib/eio_xattr.c b/src/lib/eio/eio_xattr.c
index cff21b92e7..b1105141b5 100644
--- a/legacy/eio/src/lib/eio_xattr.c
+++ b/src/lib/eio/eio_xattr.c
@@ -59,7 +59,7 @@ _eio_ls_xattr_heavy(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_ls_xattr_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
+_eio_ls_xattr_notify(void *data, Ecore_Thread *thread EINA_UNUSED, void *msg_data)
 {
    Eio_File_Char_Ls *async = data;
    const char *xattr = msg_data;
@@ -117,7 +117,7 @@ _eio_file_xattr_free(Eio_File_Xattr *async)
 }
 
 static void
-_eio_file_xattr_get_done(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_xattr_get_done(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Xattr *async = data;
 
@@ -145,7 +145,7 @@ _eio_file_xattr_get_done(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_xattr_get_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_xattr_get_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Xattr *async = data;
 
@@ -186,7 +186,7 @@ _eio_file_xattr_set(void *data, Ecore_Thread *thread)
 }
 
 static void
-_eio_file_xattr_set_done(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_xattr_set_done(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Xattr *async = data;
 
@@ -197,7 +197,7 @@ _eio_file_xattr_set_done(void *data, Ecore_Thread *thread __UNUSED__)
 }
 
 static void
-_eio_file_xattr_set_error(void *data, Ecore_Thread *thread __UNUSED__)
+_eio_file_xattr_set_error(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
    Eio_File_Xattr *async = data;