Remove duplication from ecore headers

Clean up Ecore.h and ecore_private.h

SVN revision: 44664

legacy/ecore/src/lib/ecore/Ecore.h

@@ -92,7 +92,6 @@ extern "C" {
    EAPI extern int ECORE_EXE_EVENT_DATA; /**< Data from a child process. */
    EAPI extern int ECORE_EXE_EVENT_ERROR; /**< Errors from a child process. */
 
-#ifndef _ECORE_PRIVATE_H
    enum _Ecore_Fd_Handler_Flags
      {
 	ECORE_FD_READ = 1, /**< Fd Read mask */
@@ -121,20 +120,19 @@ extern "C" {
      };
    typedef enum _Ecore_Poller_Type Ecore_Poller_Type;
 
-   typedef void Ecore_Exe; /**< A handle for spawned processes */
-   typedef void Ecore_Timer; /**< A handle for timers */
-   typedef void Ecore_Idler; /**< A handle for idlers */
-   typedef void Ecore_Idle_Enterer; /**< A handle for idle enterers */
-   typedef void Ecore_Idle_Exiter; /**< A handle for idle exiters */
-   typedef void Ecore_Fd_Handler; /**< A handle for Fd handlers */
-   typedef void Ecore_Win32_Handler; /**< A handle for HANDLE handlers on Windows */
-   typedef void Ecore_Event_Handler; /**< A handle for an event handler */
-   typedef void Ecore_Event_Filter; /**< A handle for an event filter */
-   typedef void Ecore_Event; /**< A handle for an event */
-   typedef void Ecore_Animator; /**< A handle for animators */
-   typedef void Ecore_Pipe; /**< A handle for pipes */
-   typedef void Ecore_Poller; /**< A handle for pollers */
-#endif
+   typedef struct _Ecore_Exe                   Ecore_Exe; /**< A handle for spawned processes */
+   typedef struct _Ecore_Timer                 Ecore_Timer; /**< A handle for timers */
+   typedef struct _Ecore_Idler                 Ecore_Idler; /**< A handle for idlers */
+   typedef struct _Ecore_Idle_Enterer          Ecore_Idle_Enterer; /**< A handle for idle enterers */
+   typedef struct _Ecore_Idle_Exiter           Ecore_Idle_Exiter; /**< A handle for idle exiters */
+   typedef struct _Ecore_Fd_Handler            Ecore_Fd_Handler; /**< A handle for Fd handlers */
+   typedef struct _Ecore_Win32_Handler         Ecore_Win32_Handler; /**< A handle for HANDLE handlers on Windows */
+   typedef struct _Ecore_Event_Handler         Ecore_Event_Handler; /**< A handle for an event handler */
+   typedef struct _Ecore_Event_Filter          Ecore_Event_Filter; /**< A handle for an event filter */
+   typedef struct _Ecore_Event                 Ecore_Event; /**< A handle for an event */
+   typedef struct _Ecore_Animator              Ecore_Animator; /**< A handle for animators */
+   typedef struct _Ecore_Pipe                  Ecore_Pipe; /**< A handle for pipes */
+   typedef struct _Ecore_Poller                Ecore_Poller; /**< A handle for pollers */
    typedef struct _Ecore_Event_Signal_User     Ecore_Event_Signal_User; /**< User signal event */
    typedef struct _Ecore_Event_Signal_Hup      Ecore_Event_Signal_Hup; /**< Hup signal event */
    typedef struct _Ecore_Event_Signal_Exit     Ecore_Event_Signal_Exit; /**< Exit signal event */

legacy/ecore/src/lib/ecore/ecore_anim.c

@@ -8,8 +8,8 @@
 
 #include <stdlib.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static int _ecore_animator(void *data);
 

legacy/ecore/src/lib/ecore/ecore_app.c

@@ -13,8 +13,8 @@
 # include <Evil.h>
 #endif
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static int app_argc = 0;
 static char **app_argv = NULL;

legacy/ecore/src/lib/ecore/ecore_events.c

@@ -8,8 +8,8 @@
 
 #include <stdlib.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static int                  events_num = 0;
 static Ecore_Event         *events = NULL;

legacy/ecore/src/lib/ecore/ecore_exe.c

@@ -23,8 +23,8 @@
 # include <sys/wait.h>
 #endif
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 /* TODO: Something to let people build a command line and does auto escaping -
  *

legacy/ecore/src/lib/ecore/ecore_exe_win32.c

@@ -18,8 +18,8 @@
 # include <Evil.h>
 #endif
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 #ifndef _WIN32_WCE
 

legacy/ecore/src/lib/ecore/ecore_glib.c

@@ -9,10 +9,10 @@
 #include <stdio.h>
 
 #include "Ecore.h"
+#include "ecore_private.h"
 
 #ifdef HAVE_GLIB
 #include <glib.h>
-#include "ecore_private.h"
 
 static Eina_Bool _ecore_glib_active = EINA_FALSE;
 static int (*_ecore_glib_select_original)(int, fd_set*, fd_set*, fd_set*, struct timeval *);

legacy/ecore/src/lib/ecore/ecore_hash.c

@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Data.h"
 
 #define PRIME_TABLE_MAX 21

legacy/ecore/src/lib/ecore/ecore_idle_enterer.c

@@ -8,8 +8,8 @@
 
 #include <stdlib.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static Ecore_Idle_Enterer *idle_enterers = NULL;
 static int                 idle_enterers_delete_me = 0;

legacy/ecore/src/lib/ecore/ecore_idle_exiter.c

@@ -8,8 +8,8 @@
 
 #include <stdlib.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static Ecore_Idle_Exiter *idle_exiters = NULL;
 static int                idle_exiters_delete_me = 0;

legacy/ecore/src/lib/ecore/ecore_idler.c

@@ -8,8 +8,8 @@
 
 #include <stdlib.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static Ecore_Idler *idlers = NULL;
 static int          idlers_delete_me = 0;

legacy/ecore/src/lib/ecore/ecore_list.c

@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Data.h"
 
 /* Some tests showed that beyond that value heap sort is faster than merge sort

legacy/ecore/src/lib/ecore/ecore_main.c

@@ -33,8 +33,8 @@
 # include <Evil.h>
 #endif
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static int  _ecore_main_select(double timeout);
 static void _ecore_main_fd_handlers_cleanup(void);

legacy/ecore/src/lib/ecore/ecore_path.c

@@ -13,6 +13,7 @@
 #include <unistd.h>
 #include <dirent.h>
 
+#include "Ecore.h"
 #include "ecore_private.h"
 #include "Ecore_Data.h"
 #include "Ecore_Str.h"

legacy/ecore/src/lib/ecore/ecore_pipe.c

@@ -14,8 +14,8 @@
 # include <Evil.h>
 #endif
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 /* How of then we should retry to write to the pipe */
 #define ECORE_PIPE_WRITE_RETRY 6

legacy/ecore/src/lib/ecore/ecore_plugin.c

@@ -23,9 +23,10 @@
 # include <Evil.h>
 #endif
 
+#include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Data.h"
 #include "Ecore_Str.h"
-#include "ecore_private.h"
 
 static Eina_Bool _hash_keys(const Eina_Hash	*hash,
 			    const char		*key,

legacy/ecore/src/lib/ecore/ecore_poll.c

@@ -8,8 +8,8 @@
 
 #include <stdlib.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static Ecore_Timer    *timer = NULL;
 static int             min_interval = -1;

legacy/ecore/src/lib/ecore/ecore_private.h

@@ -162,25 +162,6 @@ EAPI void ecore_print_warning(const char *function, const char *sparam);
 
 typedef unsigned int              Ecore_Magic;
 
-#ifndef _ECORE_H
-enum _Ecore_Fd_Handler_Flags
-{
-   ECORE_FD_READ = 1,
-   ECORE_FD_WRITE = 2,
-   ECORE_FD_ERROR = 4
-};
-typedef enum _Ecore_Fd_Handler_Flags Ecore_Fd_Handler_Flags;
-enum _Ecore_Exe_Flags
-{
-   ECORE_EXE_PIPE_READ = 1,
-   ECORE_EXE_PIPE_WRITE = 2,
-   ECORE_EXE_PIPE_ERROR = 4,
-   ECORE_EXE_PIPE_READ_LINE_BUFFERED = 8,
-   ECORE_EXE_PIPE_ERROR_LINE_BUFFERED = 16,
-   ECORE_EXE_PIPE_AUTO = 32,
-   ECORE_EXE_RESPAWN = 64,
-   ECORE_EXE_USE_SH = 128,
-   ECORE_EXE_NOT_LEADER = 256
    /* FIXME: Getting respawn to work
     *
     * There is no way that we can do anything about the internal state info of
@@ -241,32 +222,6 @@ enum _Ecore_Exe_Flags
     * over may be, so a random element added to the timeout may help, and won't
     * hurt.  The user code may need to be informed that a timeout is in progress.
     */
-};
-typedef enum _Ecore_Exe_Flags Ecore_Exe_Flags;
-enum _Ecore_Poller_Type
-{
-   ECORE_POLLER_CORE = 0
-};
-typedef enum _Ecore_Poller_Type Ecore_Poller_Type;
-
-typedef struct _Ecore_Exe           Ecore_Exe;
-typedef struct _Ecore_Timer         Ecore_Timer;
-typedef struct _Ecore_Idler         Ecore_Idler;
-typedef struct _Ecore_Idle_Enterer  Ecore_Idle_Enterer;
-typedef struct _Ecore_Idle_Exiter   Ecore_Idle_Exiter;
-typedef struct _Ecore_Fd_Handler    Ecore_Fd_Handler;
-typedef struct _Ecore_Event_Handler Ecore_Event_Handler;
-typedef struct _Ecore_Event_Filter  Ecore_Event_Filter;
-typedef struct _Ecore_Event         Ecore_Event;
-typedef struct _Ecore_Animator      Ecore_Animator;
-typedef struct _Ecore_Pipe          Ecore_Pipe;
-typedef struct _Ecore_Poller        Ecore_Poller;
-#ifdef _WIN32
-typedef struct _Ecore_Win32_Handler Ecore_Win32_Handler;
-#else
-typedef void                        Ecore_Win32_Handler;
-#endif
-
 #ifndef _WIN32
 struct _Ecore_Exe
 {
@@ -429,8 +384,6 @@ struct _Ecore_Poller
    void          *data;
 };
 
-#endif
-
 EAPI void          _ecore_magic_fail(const void *d, Ecore_Magic m, Ecore_Magic req_m, const char *fname);
 
 void          _ecore_timer_shutdown(void);

legacy/ecore/src/lib/ecore/ecore_sheap.c

@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Data.h"
 
 #define HEAP_INCREMENT 4096

legacy/ecore/src/lib/ecore/ecore_signal.c

@@ -15,8 +15,8 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 /* make mono happy - this is evil though... */
 #undef SIGPWR

legacy/ecore/src/lib/ecore/ecore_str.c

@@ -30,6 +30,7 @@
 #include <limits.h>
 #include <sys/types.h>
 
+#include "Ecore.h"
 #include "ecore_private.h"
 #include "Ecore_Str.h"
 

legacy/ecore/src/lib/ecore/ecore_strbuf.c

@@ -8,8 +8,8 @@
 
 #include <string.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Data.h"
 #include "Ecore_Str.h"
 

legacy/ecore/src/lib/ecore/ecore_thread.c

@@ -10,8 +10,8 @@
 # include <pthread.h>
 #endif
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 #ifdef EFL_HAVE_PTHREAD
 typedef struct _Ecore_Pthread_Worker Ecore_Pthread_Worker;

legacy/ecore/src/lib/ecore/ecore_timer.c

@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 static void _ecore_timer_set(Ecore_Timer *timer, double at, double in, int (*func) (void *data), void *data);
 

legacy/ecore/src/lib/ecore/ecore_tree.c

@@ -8,8 +8,8 @@
 
 #include <string.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Data.h"
 
 /* A macro for determining the highest node at given branch */

legacy/ecore/src/lib/ecore/ecore_value.c

@@ -40,8 +40,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "Ecore.h"
-#include "Ecore_Data.h"
 #include "ecore_private.h"
+#include "Ecore_Data.h"
 
 EAPI const unsigned int ecore_prime_table[] =
 {

legacy/ecore/src/lib/ecore_con/ecore_con_dns.c

@@ -43,8 +43,8 @@
 #include <arpa/nameser.h>
 #include <netdb.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "ecore_con_private.h"
 
 typedef struct _CB_Data CB_Data;

legacy/ecore/src/lib/ecore_con/ecore_con_info.c

@@ -41,8 +41,8 @@ void *alloca (size_t);
 #include <arpa/nameser.h>
 #include <netdb.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "ecore_con_private.h"
 
 typedef struct _CB_Data CB_Data;

legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c

@@ -12,8 +12,8 @@
 # include <openssl/ssl.h>
 #endif
 
-#include "ecore_con_private.h"
 #include "Ecore.h"
+#include "ecore_con_private.h"
 
 static int _init_con_ssl_init_count = 0;
 

legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c

@@ -18,9 +18,9 @@
 #include <ctype.h>
 
 #include <Ecore.h>
+#include "ecore_private.h"
 #include <Ecore_Ipc.h>
 
-#include "ecore_private.h"
 #include "ecore_config_ipc.h"
 #include "ecore_config_util.h"
 #include "ecore_config_private.h"

legacy/ecore/src/lib/ecore_config/ecore_config_private.h

@@ -61,6 +61,7 @@ int                   _ecore_config_ipc_ecore_init(const char *pipe_name, void *
 int                   _ecore_config_ipc_ecore_exit(void **data);
 int                   _ecore_config_ipc_ecore_poll(void **data);
 
+#include "Ecore.h"
 #include "ecore_private.h"
 
 #endif

legacy/ecore/src/lib/ecore_config/ecore_config_util.c

@@ -15,6 +15,7 @@
 
 #include <stdarg.h>		/* varargs in sprintf/appendf */
 
+#include "Ecore.h"
 #include "ecore_private.h"
 
 #include "Ecore_Config.h"

legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c

@@ -9,11 +9,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "ecore_private.h"
 #include "Ecore_DirectFB.h"
 #include "ecore_directfb_private.h"
 #include "ecore_directfb_keys.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 
 /* ecore_directfb */
 /******************/

legacy/ecore/src/lib/ecore_evas/ecore_evas.c

@@ -9,9 +9,9 @@
 #include <string.h>
 
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Input.h"
 
-#include "ecore_private.h"
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 

legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c

@@ -3,9 +3,9 @@
 #endif
 
 #include <Ecore.h>
+#include "ecore_private.h"
 #include <Ecore_Input.h>
 
-#include "ecore_private.h"
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 

legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c

@@ -9,11 +9,11 @@
 #include <string.h>
 
 #include <Ecore.h>
+#include "ecore_private.h"
 #ifdef BUILD_ECORE_EVAS_DIRECTFB
 #include <Ecore_DirectFB.h>
 #endif
 
-#include "ecore_private.h"
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 

legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c

@@ -10,12 +10,12 @@
 #include <dirent.h>
 
 #include <Ecore.h>
+#include "ecore_private.h"
 #ifdef BUILD_ECORE_EVAS_FB
 #include <Ecore_Fb.h>
 #include <ecore_fb_private.h>
 #endif
 
-#include "ecore_private.h"
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 

legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c

@@ -11,9 +11,9 @@
 #endif
 
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Input.h"
 
-#include "ecore_private.h"
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 

legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c

@@ -9,8 +9,8 @@
 #include <string.h>
 
 #include <Ecore.h>
-
 #include "ecore_private.h"
+
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 

legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c

@@ -9,6 +9,7 @@
 #include <stdlib.h> /* for NULL */
 
 #include <Ecore.h>
+#include "ecore_private.h"
 #ifdef BUILD_ECORE_EVAS_WIN32
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
@@ -17,7 +18,6 @@
 # include <ecore_win32_private.h>
 #endif /* BUILD_ECORE_EVAS_WIN32 */
 
-#include "ecore_private.h"
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 

legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c

@@ -9,6 +9,7 @@
 #include <stdlib.h> /* for NULL */
 
 #include <Ecore.h>
+#include "ecore_private.h"
 #ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
@@ -17,7 +18,6 @@
 # include <ecore_wince_private.h>
 #endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
 
-#include "ecore_private.h"
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 

legacy/ecore/src/lib/ecore_fb/ecore_fb_private.h

@@ -1,8 +1,8 @@
 #ifndef _ECORE_FB_PRIVATE_H
 #define _ECORE_FB_PRIVATE_H
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Data.h"
 
 #include <stdio.h>

legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c

@@ -11,6 +11,7 @@
 #include <string.h>
 #include <limits.h>
 
+#include <Ecore.h>
 #include <ecore_private.h>
 
 #include "Ecore_IMF.h"

legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c

@@ -7,8 +7,8 @@
 #endif
 
 #include "Ecore.h"
-#include "Ecore_Con.h"
 #include "ecore_private.h"
+#include "Ecore_Con.h"
 #include "ecore_ipc_private.h"
 #include "Ecore_Ipc.h"
 

legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c

@@ -10,9 +10,9 @@
 
 #include "Eina.h"
 #include "Ecore_Sdl.h"
-#include "ecore_private.h"
 #include "Ecore_Input.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "Ecore_Sdl_Keys.h"
 
 #include <eina_rbtree.h>

legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h

@@ -54,6 +54,7 @@
 # include <xcb/xprint.h>
 #endif /* ECORE_XCB_XPRINT */
 
+#include "Ecore.h"
 #include "ecore_private.h"
 #include "Ecore_X.h"
 

legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c

@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "ecore_x_private.h"
 #include "Ecore_X.h"
 #include "Ecore_X_Atoms.h"

legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c

@@ -8,8 +8,8 @@
 
 #include <stdlib.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "ecore_x_private.h"
 #include "Ecore_X.h"
 

legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c

@@ -11,8 +11,8 @@
 
 #include <langinfo.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "ecore_x_private.h"
 #include "Ecore_X.h"
 #include "Ecore_X_Atoms.h"

legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h

@@ -51,6 +51,7 @@
 #include <X11/XKBlib.h>
 #endif
 
+#include "Ecore.h"
 #include "ecore_private.h"
 #include "Ecore_X.h"
 

legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c

@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ecore_private.h"
 #include "Ecore.h"
+#include "ecore_private.h"
 #include "ecore_x_private.h"
 #include "Ecore_X.h"
 #include "Ecore_X_Atoms.h"