summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-26 14:46:35 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-26 14:46:35 -0500
commite22a0ab4c743221d4064f57bff7d6d60dc145328 (patch)
tree95987f4cc1a140a7e43c845529221878b23a3cb2
parent3dbca39f98288580c62a43c179ac11621433ec88 (diff)
eio: move some typedefs into base eio header
eio eo api uses these. FIXME?
-rw-r--r--src/lib/eio/Eio.h10
-rw-r--r--src/lib/eio/Eio_Legacy.h7
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 @@
63extern "C" { 63extern "C" {
64#endif 64#endif
65 65
66
67/**
68 * @typedef Eio_File
69 * Generic asynchronous I/O reference.
70 * @ingroup Eio
71 */
72typedef struct _Eio_File Eio_File;
73
74typedef Eina_Bool (*Eio_Filter_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
75
66#ifndef EFL_NOLEGACY_API_SUPPORT 76#ifndef EFL_NOLEGACY_API_SUPPORT
67#include "Eio_Legacy.h" 77#include "Eio_Legacy.h"
68#endif 78#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;
134 */ 134 */
135 135
136/** 136/**
137 * @typedef Eio_File
138 * Generic asynchronous I/O reference.
139 */
140typedef struct _Eio_File Eio_File;
141
142/**
143 * @typedef Eio_Progress 137 * @typedef Eio_Progress
144 * Progress information on a specific operation. 138 * Progress information on a specific operation.
145 */ 139 */
@@ -148,7 +142,6 @@ typedef struct _Eio_Progress Eio_Progress;
148typedef Eina_Bool (*Eio_Filter_Cb)(void *data, Eio_File *handler, const char *file); 142typedef Eina_Bool (*Eio_Filter_Cb)(void *data, Eio_File *handler, const char *file);
149typedef void (*Eio_Main_Cb)(void *data, Eio_File *handler, const char *file); 143typedef void (*Eio_Main_Cb)(void *data, Eio_File *handler, const char *file);
150 144
151typedef Eina_Bool (*Eio_Filter_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
152typedef Eina_Bool (*Eio_Filter_Dir_Cb)(void *data, Eio_File *handler, Eina_File_Direct_Info *info); 145typedef Eina_Bool (*Eio_Filter_Dir_Cb)(void *data, Eio_File *handler, Eina_File_Direct_Info *info);
153typedef void (*Eio_Main_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info); 146typedef void (*Eio_Main_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
154 147