summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-17 11:54:11 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-17 11:54:11 +0200
commitc006f64f791ee59ab8f41343029b6b830e6458d1 (patch)
tree93b385d47b52788e80b9589db56df33d32404869 /src/modules
parent40bdc50a12975f927fc9490d9b81f5f597c56b33 (diff)
evas: more fix for include order in an attempt to fix Windows build.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c8
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index ac3fd80..b926d2b 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -7,6 +7,10 @@
7# include <unistd.h> 7# include <unistd.h>
8#endif 8#endif
9 9
10#include "software/Ector_Software.h"
11
12#include "ector_cairo_software_surface.eo.h"
13
10#ifdef HAVE_DLSYM 14#ifdef HAVE_DLSYM
11# include <dlfcn.h> /* dlopen,dlclose,etc */ 15# include <dlfcn.h> /* dlopen,dlclose,etc */
12#else 16#else
@@ -21,10 +25,6 @@
21#include "evas_cs2_private.h" 25#include "evas_cs2_private.h"
22#endif 26#endif
23 27
24#include "software/Ector_Software.h"
25
26#include "ector_cairo_software_surface.eo.h"
27
28#define EVAS_GL_NO_GL_H_CHECK 1 28#define EVAS_GL_NO_GL_H_CHECK 1
29#include "Evas_GL.h" 29#include "Evas_GL.h"
30 30
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index af26cb6..fa41a5a 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -7,6 +7,8 @@
7 7
8#include <software/Ector_Software.h> 8#include <software/Ector_Software.h>
9 9
10#include "ector_cairo_software_surface.eo.h"
11
10#ifdef HAVE_DLSYM 12#ifdef HAVE_DLSYM
11# include <dlfcn.h> /* dlopen,dlclose,etc */ 13# include <dlfcn.h> /* dlopen,dlclose,etc */
12 14
@@ -20,8 +22,6 @@
20 22
21#include "Evas_Engine_Software_Generic.h" 23#include "Evas_Engine_Software_Generic.h"
22 24
23#include "ector_cairo_software_surface.eo.h"
24
25#ifdef EVAS_GL 25#ifdef EVAS_GL
26//----------------------------------// 26//----------------------------------//
27// OSMesa... 27// OSMesa...