Ecore:

Windows : change API (I allow myself that right for the win32 port :) )

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@57724 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 215545e..03b1634 100644 (file)
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -237,10 +237,10 @@ extern "C" {
     */
    typedef void (*Ecore_Fd_Prep_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
    /**
-    * @typedef Ecore_Fd_Win32_Cb Ecore_Fd_Win32_Cb
+    * @typedef Ecore_Win32_Handle_Cb Ecore_Win32_Handle_Cb
     * A callback used by an @ref Ecore_Win32_Handler.
     */
-   typedef Eina_Bool (*Ecore_Fd_Win32_Cb) (void *data, Ecore_Win32_Handler *wh);
+   typedef Eina_Bool (*Ecore_Win32_Handle_Cb) (void *data, Ecore_Win32_Handler *wh);
 
 
    typedef struct _Ecore_Job Ecore_Job; /**< A job handle */
@@ -455,7 +455,7 @@ extern "C" {
    EAPI Eina_Bool         ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
    EAPI void              ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
 
-   EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Fd_Win32_Cb func, const void *data);
+   EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data);
    EAPI void                *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler);
 
   /**

diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index c9e9873..ec63b35 100644 (file)
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -85,11 +85,11 @@ struct _Ecore_Win32_Handler
 {
    EINA_INLIST;
    ECORE_MAGIC;
-   HANDLE         h;
-   Ecore_Fd_Win32_Cb func;
-   void          *data;
-   int            references;
-   Eina_Bool      delete_me : 1;
+   HANDLE                h;
+   Ecore_Win32_Handle_Cb func;
+   void                 *data;
+   int                   references;
+   Eina_Bool             delete_me : 1;
 };
 #endif
 
@@ -808,7 +808,7 @@ ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func
 
 #ifdef _WIN32
 EAPI Ecore_Win32_Handler *
-ecore_main_win32_handler_add(void *h, Ecore_Fd_Win32_Cb func, const void *data)
+ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data)
 {
    Ecore_Win32_Handler *wh;
 
@@ -828,7 +828,7 @@ ecore_main_win32_handler_add(void *h, Ecore_Fd_Win32_Cb func, const void *data)
 }
 #else
 EAPI Ecore_Win32_Handler *
-ecore_main_win32_handler_add(void *h __UNUSED__, Ecore_Fd_Win32_Cb func __UNUSED__,
+ecore_main_win32_handler_add(void *h __UNUSED__, Ecore_Win32_Handle_Cb func __UNUSED__,
                              const void *data __UNUSED__)
 {
    return NULL;