ecore_evas: re-order inclusion of header to fix compilation on Windows.

It is a very tricky things to get header order right on windows. Having that
order only in .c files simplify the work a lot. So let's try to do it with
Ecore_Evas after it rewrite and split into modules.

13 files changed, 112 insertions, 97 deletions

diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 839d7a6d50..7d73cf82f5 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -1,9 +1,8 @@
 #ifndef _ECORE_EVAS_H
 #define _ECORE_EVAS_H
 
-#include "Ecore_Evas_Types.h"
-
 #include <Evas.h>
+#include <Ecore_Evas_Types.h>
 
 #ifdef EAPI
 # undef EAPI
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 15b95736f3..8635c97e64 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -21,12 +21,17 @@
 # include <Evil.h>
 #endif
 
-#include "Ecore.h"
+#include <Ecore.h>
 #include "ecore_private.h"
-#include "Ecore_Input.h"
+#include <Ecore_Input.h>
+#include <Ecore_Input_Evas.h>
 
-#include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
+#include "ecore_evas_private.h"
+#include "ecore_evas_x11.h"
+#include "ecore_evas_wayland.h"
+#include "ecore_evas_extn.h"
+#include "ecore_evas_win32.h"
 
 EAPI Eina_Bool _ecore_evas_app_comp_sync = 1;
 EAPI int _ecore_evas_log_dom = -1;
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c
index c76af25ada..a3cd572475 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -2,8 +2,17 @@
 # include <config.h>
 #endif
 
-#include "ecore_evas_buffer.h"
+#include <stdlib.h>
+
+#include <Evas.h>
 #include <Evas_Engine_Buffer.h>
+#include <Ecore.h>
+#include "ecore_private.h"
+#include <Ecore_Input.h>
+
+#include "Ecore_Evas.h"
+#include "ecore_evas_buffer.h"
+#include "ecore_evas_private.h"
 
 static void
 _ecore_evas_buffer_free(Ecore_Evas *ee)
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.h b/src/lib/ecore_evas/ecore_evas_buffer.h
index 06f82f9fea..e065d8a5f9 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.h
+++ b/src/lib/ecore_evas/ecore_evas_buffer.h
@@ -1,16 +1,6 @@
 #ifndef _ECORE_EVAS_BUFFER_PRIVATE_H_
 #define _ECORE_EVAS_BUFFER_PRIVATE_H_
 
-#include <stdlib.h>
-
-#include <Ecore.h>
-#include "ecore_private.h"
-#include <Ecore_Input.h>
-
-#include "ecore_evas_private.h"
-#include "Ecore_Evas.h"
-
-
 typedef struct _Ecore_Evas_Engine_Buffer_Data Ecore_Evas_Engine_Buffer_Data;
 
 struct _Ecore_Evas_Engine_Buffer_Data {
diff --git a/src/lib/ecore_evas/ecore_evas_deprecated.c b/src/lib/ecore_evas/ecore_evas_deprecated.c
index 20a57ebf80..1b40807e53 100644
--- a/src/lib/ecore_evas/ecore_evas_deprecated.c
+++ b/src/lib/ecore_evas/ecore_evas_deprecated.c
@@ -7,8 +7,8 @@
 #include <Ecore.h>
 #include "ecore_private.h"
 
-#include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
+#include "ecore_evas_private.h"
 
 
 /* Ecore_Evas WinCE support was removed. However we keep the functions
diff --git a/src/lib/ecore_evas/ecore_evas_ews.c b/src/lib/ecore_evas/ecore_evas_ews.c
index 936b70a415..ea5c983005 100644
--- a/src/lib/ecore_evas/ecore_evas_ews.c
+++ b/src/lib/ecore_evas/ecore_evas_ews.c
@@ -6,15 +6,14 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include <Eina.h>
-#include <Ecore.h>
-#include "ecore_private.h"
 #include <Evas.h>
 #include <Evas_Engine_Buffer.h>
+#include <Ecore.h>
+#include "ecore_private.h"
 #include <Ecore_Input.h>
 
-#include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
+#include "ecore_evas_private.h"
 
 EAPI int ECORE_EVAS_EWS_EVENT_MANAGER_CHANGE = 0;
 EAPI int ECORE_EVAS_EWS_EVENT_ADD = 0;
diff --git a/src/lib/ecore_evas/ecore_evas_extn.h b/src/lib/ecore_evas/ecore_evas_extn.h
new file mode 100644
index 0000000000..540f1384a7
--- /dev/null
+++ b/src/lib/ecore_evas/ecore_evas_extn.h
@@ -0,0 +1,15 @@
+#ifndef ECORE_EVAS_EXTN_H_
+# define ECORE_EVAS_EXTN_H_
+
+typedef struct _Ecore_Evas_Interface_Extn Ecore_Evas_Interface_Extn;
+
+struct _Ecore_Evas_Interface_Extn {
+   Ecore_Evas_Interface base;
+
+    void            (*data_lock)(Ecore_Evas *ee);
+    void            (*data_unlock)(Ecore_Evas *ee);
+    Eina_Bool       (*connect)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
+    Eina_Bool       (*listen)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
+};
+
+#endif
diff --git a/src/lib/ecore_evas/ecore_evas_module.c b/src/lib/ecore_evas/ecore_evas_module.c
index 4160dedc70..0194bd2973 100644
--- a/src/lib/ecore_evas/ecore_evas_module.c
+++ b/src/lib/ecore_evas/ecore_evas_module.c
@@ -2,6 +2,9 @@
 # include <config.h>
 #endif
 
+#include <Ecore.h>
+#include "ecore_private.h"
+
 #include "Ecore_Evas.h"
 #include "ecore_evas_private.h"
 
@@ -9,7 +12,7 @@ static Eina_Hash *_registered_engines = NULL;
 static Eina_List *_engines_paths = NULL;
 static Eina_List *_engines_available = NULL;
 
-#if defined(__CEGCC__) || defined(__MINGW32CE__) || defined(_WIN32)
+#ifdef _WIN32
 # define ECORE_EVAS_ENGINE_NAME "module.dll"
 #else
 # define ECORE_EVAS_ENGINE_NAME "module.so"
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index 793461fe73..f789c3f20b 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -1,14 +1,6 @@
 #ifndef _ECORE_EVAS_PRIVATE_H
 #define _ECORE_EVAS_PRIVATE_H
 
-#include "Ecore_Evas_Types.h"
-
-#include <Evas.h>
-#include <Ecore.h>
-#include <ecore_private.h>
-#include <Ecore_Input.h>
-#include <Ecore_Input_Evas.h>
-
 #define ECORE_MAGIC_EVAS 0x76543211
 
 /** Log domain macros and variables **/
@@ -53,14 +45,6 @@ typedef struct _Ecore_Evas_Engine_Func Ecore_Evas_Engine_Func;
 typedef struct _Ecore_Evas_Interface Ecore_Evas_Interface;
 
 /* Engines interfaces */
-typedef struct _Ecore_Evas_Interface_Extn Ecore_Evas_Interface_Extn;
-typedef struct _Ecore_Evas_Interface_X11 Ecore_Evas_Interface_X11;
-typedef struct _Ecore_Evas_Interface_Software_X11 Ecore_Evas_Interface_Software_X11;
-typedef struct _Ecore_Evas_Interface_Gl_X11 Ecore_Evas_Interface_Gl_X11;
-typedef struct _Ecore_Evas_Interface_Wayland Ecore_Evas_Interface_Wayland;
-typedef struct _Ecore_Evas_Interface_Win32 Ecore_Evas_Interface_Win32;
-
-
 struct _Ecore_Evas_Engine_Func
 {
    void (*fn_free) (Ecore_Evas *ee);
@@ -133,64 +117,6 @@ struct _Ecore_Evas_Interface
     unsigned int version;
 };
 
-struct _Ecore_Evas_Interface_X11 {
-   Ecore_Evas_Interface base;
-
-   void           (*leader_set)(Ecore_Evas *ee, Ecore_X_Window win);
-   Ecore_X_Window (*leader_get)(Ecore_Evas *ee);
-   void           (*leader_default_set)(Ecore_Evas *ee);
-   void           (*shape_input_rectangle_set)(Ecore_Evas *ee, int x, int y, int w, int h);
-   void           (*shape_input_rectangle_add)(Ecore_Evas *ee, int x, int y, int w, int h);
-   void           (*shape_input_rectangle_subtract)(Ecore_Evas *ee, int x, int y, int w, int h);
-   void           (*shape_input_empty)(Ecore_Evas *ee);
-   void           (*shape_input_reset)(Ecore_Evas *ee);
-   void           (*shape_input_apply)(Ecore_Evas *ee);
-};
-
-struct _Ecore_Evas_Interface_Software_X11 {
-   Ecore_Evas_Interface base;
-
-   Ecore_X_Window (*window_get)(const Ecore_Evas *ee);
-   void           (*resize_set)(Ecore_Evas *ee, Eina_Bool on);
-   Eina_Bool      (*resize_get)(const Ecore_Evas *ee);
-   void           (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win);
-};
-
-struct _Ecore_Evas_Interface_Gl_X11 {
-   Ecore_Evas_Interface base;
-
-   Ecore_X_Window  (*window_get)(const Ecore_Evas *ee);
-   void            (*resize_set)(Ecore_Evas *ee, Eina_Bool on);
-   Eina_Bool       (*resize_get)(const Ecore_Evas *ee);
-   void            (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win);
-   void            (*pre_post_swap_callback_set)(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
-};
-
-struct _Ecore_Evas_Interface_Extn {
-   Ecore_Evas_Interface base;
-
-    void            (*data_lock)(Ecore_Evas *ee);
-    void            (*data_unlock)(Ecore_Evas *ee);
-    Eina_Bool       (*connect)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
-    Eina_Bool       (*listen)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
-};
-
-struct _Ecore_Evas_Interface_Wayland {
-   Ecore_Evas_Interface base;
-
-    void             (*resize)(Ecore_Evas *ee, int location);
-    void             (*move)(Ecore_Evas *ee, int x, int y);
-    void             (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y);
-    void             (*type_set)(Ecore_Evas *ee, int type);
-    Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee);
-};
-
-struct _Ecore_Evas_Interface_Win32 {
-   Ecore_Evas_Interface base;
-
-   Ecore_Win32_Window* (*window_get)(const Ecore_Evas *ee);
-};
-
 struct _Ecore_Evas_Engine
 {
    Ecore_Evas_Engine_Func *func;
diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 824464021d..e50c8de69a 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -9,8 +9,8 @@
 #include <Ecore_Getopt.h>
 #include "ecore_private.h"
 
-#include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
+#include "ecore_evas_private.h"
 
 static const char ASSOCIATE_KEY[] = "__Ecore_Evas_Associate";
 
diff --git a/src/lib/ecore_evas/ecore_evas_wayland.h b/src/lib/ecore_evas/ecore_evas_wayland.h
new file mode 100644
index 0000000000..ba21718470
--- /dev/null
+++ b/src/lib/ecore_evas/ecore_evas_wayland.h
@@ -0,0 +1,16 @@
+#ifndef ECORE_EVAS_WAYLAND_H_
+# define ECORE_EVAS_WAYLAND_H_
+
+typedef struct _Ecore_Evas_Interface_Wayland Ecore_Evas_Interface_Wayland;
+
+struct _Ecore_Evas_Interface_Wayland {
+   Ecore_Evas_Interface base;
+
+   void             (*resize)(Ecore_Evas *ee, int location);
+   void             (*move)(Ecore_Evas *ee, int x, int y);
+   void             (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y);
+   void             (*type_set)(Ecore_Evas *ee, int type);
+   Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee);
+};
+
+#endif
diff --git a/src/lib/ecore_evas/ecore_evas_win32.h b/src/lib/ecore_evas/ecore_evas_win32.h
new file mode 100644
index 0000000000..86cfa1830e
--- /dev/null
+++ b/src/lib/ecore_evas/ecore_evas_win32.h
@@ -0,0 +1,12 @@
+#ifndef ECORE_EVAS_WIN32_H
+# define ECORE_EVAS_WIN32_H
+
+typedef struct _Ecore_Evas_Interface_Win32 Ecore_Evas_Interface_Win32;
+
+struct _Ecore_Evas_Interface_Win32 {
+   Ecore_Evas_Interface base;
+
+   Ecore_Win32_Window* (*window_get)(const Ecore_Evas *ee);
+};
+
+#endif
diff --git a/src/lib/ecore_evas/ecore_evas_x11.h b/src/lib/ecore_evas/ecore_evas_x11.h
new file mode 100644
index 0000000000..10d4fe8a1b
--- /dev/null
+++ b/src/lib/ecore_evas/ecore_evas_x11.h
@@ -0,0 +1,41 @@
+#ifndef ECORE_EVAS_X11_H_
+# define ECORE_EVAS_X11_H_
+
+typedef struct _Ecore_Evas_Interface_X11 Ecore_Evas_Interface_X11;
+typedef struct _Ecore_Evas_Interface_Software_X11 Ecore_Evas_Interface_Software_X11;
+typedef struct _Ecore_Evas_Interface_Gl_X11 Ecore_Evas_Interface_Gl_X11;
+
+struct _Ecore_Evas_Interface_X11 {
+   Ecore_Evas_Interface base;
+
+   void           (*leader_set)(Ecore_Evas *ee, Ecore_X_Window win);
+   Ecore_X_Window (*leader_get)(Ecore_Evas *ee);
+   void           (*leader_default_set)(Ecore_Evas *ee);
+   void           (*shape_input_rectangle_set)(Ecore_Evas *ee, int x, int y, int w, int h);
+   void           (*shape_input_rectangle_add)(Ecore_Evas *ee, int x, int y, int w, int h);
+   void           (*shape_input_rectangle_subtract)(Ecore_Evas *ee, int x, int y, int w, int h);
+   void           (*shape_input_empty)(Ecore_Evas *ee);
+   void           (*shape_input_reset)(Ecore_Evas *ee);
+   void           (*shape_input_apply)(Ecore_Evas *ee);
+};
+
+struct _Ecore_Evas_Interface_Software_X11 {
+   Ecore_Evas_Interface base;
+
+   Ecore_X_Window (*window_get)(const Ecore_Evas *ee);
+   void           (*resize_set)(Ecore_Evas *ee, Eina_Bool on);
+   Eina_Bool      (*resize_get)(const Ecore_Evas *ee);
+   void           (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win);
+};
+
+struct _Ecore_Evas_Interface_Gl_X11 {
+   Ecore_Evas_Interface base;
+
+   Ecore_X_Window  (*window_get)(const Ecore_Evas *ee);
+   void            (*resize_set)(Ecore_Evas *ee, Eina_Bool on);
+   Eina_Bool       (*resize_get)(const Ecore_Evas *ee);
+   void            (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win);
+   void            (*pre_post_swap_callback_set)(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
+};
+
+#endif