eio: move some typedefs into base eio header

eio eo api uses these. FIXME?

2 files changed, 10 insertions, 7 deletions

diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index df2cec27df..2a446d6ed4 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -63,6 +63,16 @@
 extern "C" {
 #endif
 
+
+/**
+ * @typedef Eio_File
+ * Generic asynchronous I/O reference.
+ * @ingroup Eio
+ */
+typedef struct _Eio_File Eio_File;
+
+typedef Eina_Bool (*Eio_Filter_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
+
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Eio_Legacy.h"
 #endif
diff --git a/src/lib/eio/Eio_Legacy.h b/src/lib/eio/Eio_Legacy.h
index 571549b0bd..d7e9a446ab 100644
--- a/src/lib/eio/Eio_Legacy.h
+++ b/src/lib/eio/Eio_Legacy.h
@@ -134,12 +134,6 @@ typedef enum _Eio_File_Op Eio_File_Op;
  */
 
 /**
- * @typedef Eio_File
- * Generic asynchronous I/O reference.
- */
-typedef struct _Eio_File Eio_File;
-
-/**
  * @typedef Eio_Progress
  * Progress information on a specific operation.
  */
@@ -148,7 +142,6 @@ typedef struct _Eio_Progress Eio_Progress;
 typedef Eina_Bool (*Eio_Filter_Cb)(void *data, Eio_File *handler, const char *file);
 typedef void      (*Eio_Main_Cb)(void *data, Eio_File *handler, const char *file);
 
-typedef Eina_Bool (*Eio_Filter_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
 typedef Eina_Bool (*Eio_Filter_Dir_Cb)(void *data, Eio_File *handler, Eina_File_Direct_Info *info);
 typedef void      (*Eio_Main_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);