summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-28 14:24:48 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-05-07 09:53:10 +0200
commitce5ccfb5bee5174b168f0df49b75df2ab3849454 (patch)
tree9b306bbd87d30a70f20056aa44f9e90a3b593d43 /src/modules
parent71b7fc982a2e23bcb41bf6d227bceeba1f5596ec (diff)
ecore: remove the need to order the header correctly for Windows.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c21
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c22
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn.c22
-rw-r--r--src/modules/ecore_evas/engines/fb/ecore_evas_fb.c22
-rw-r--r--src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c22
-rw-r--r--src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c22
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c22
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c22
-rw-r--r--src/modules/ecore_evas/engines/win32/ecore_evas_win32.c22
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c22
10 files changed, 219 insertions, 0 deletions
diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
index 985792b..21f4e3b 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -13,6 +13,27 @@
13#include "Ecore_Evas.h" 13#include "Ecore_Evas.h"
14#include "ecore_evas_private.h" 14#include "ecore_evas_private.h"
15 15
16#ifdef EAPI
17# undef EAPI
18#endif
19
20#ifdef _WIN32
21# ifdef DLL_EXPORT
22# define EAPI __declspec(dllexport)
23# else
24# define EAPI
25# endif /* ! DLL_EXPORT */
26#else
27# ifdef __GNUC__
28# if __GNUC__ >= 4
29# define EAPI __attribute__ ((visibility("default")))
30# else
31# define EAPI
32# endif
33# else
34# define EAPI
35# endif
36#endif /* ! _WIN32 */
16 37
17// FIXME: this engine has lots of problems. only 1 window at a time, drawRect looks wrong, doesnt handle resizes and more 38// FIXME: this engine has lots of problems. only 1 window at a time, drawRect looks wrong, doesnt handle resizes and more
18 39
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 6ee3659..01c230b 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -21,6 +21,28 @@
21# include <dlfcn.h> 21# include <dlfcn.h>
22#endif 22#endif
23 23
24#ifdef EAPI
25# undef EAPI
26#endif
27
28#ifdef _WIN32
29# ifdef DLL_EXPORT
30# define EAPI __declspec(dllexport)
31# else
32# define EAPI
33# endif /* ! DLL_EXPORT */
34#else
35# ifdef __GNUC__
36# if __GNUC__ >= 4
37# define EAPI __attribute__ ((visibility("default")))
38# else
39# define EAPI
40# endif
41# else
42# define EAPI
43# endif
44#endif /* ! _WIN32 */
45
24typedef struct _Ecore_Evas_Engine_Drm_Data Ecore_Evas_Engine_Drm_Data; 46typedef struct _Ecore_Evas_Engine_Drm_Data Ecore_Evas_Engine_Drm_Data;
25 47
26struct _Ecore_Evas_Engine_Drm_Data 48struct _Ecore_Evas_Engine_Drm_Data
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
index 9cb7f6f..869005f 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -1,5 +1,27 @@
1#include "ecore_evas_extn_engine.h" 1#include "ecore_evas_extn_engine.h"
2 2
3#ifdef EAPI
4# undef EAPI
5#endif
6
7#ifdef _WIN32
8# ifdef DLL_EXPORT
9# define EAPI __declspec(dllexport)
10# else
11# define EAPI
12# endif /* ! DLL_EXPORT */
13#else
14# ifdef __GNUC__
15# if __GNUC__ >= 4
16# define EAPI __attribute__ ((visibility("default")))
17# else
18# define EAPI
19# endif
20# else
21# define EAPI
22# endif
23#endif /* ! _WIN32 */
24
3#define NBUF 2 25#define NBUF 2
4 26
5static int blank = 0x00000000; 27static int blank = 0x00000000;
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 8d008ac..8042d0c 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -18,6 +18,28 @@
18#include "ecore_evas_private.h" 18#include "ecore_evas_private.h"
19#include <Evas_Engine_FB.h> 19#include <Evas_Engine_FB.h>
20 20
21#ifdef EAPI
22# undef EAPI
23#endif
24
25#ifdef _WIN32
26# ifdef DLL_EXPORT
27# define EAPI __declspec(dllexport)
28# else
29# define EAPI
30# endif /* ! DLL_EXPORT */
31#else
32# ifdef __GNUC__
33# if __GNUC__ >= 4
34# define EAPI __attribute__ ((visibility("default")))
35# else
36# define EAPI
37# endif
38# else
39# define EAPI
40# endif
41#endif /* ! _WIN32 */
42
21static int _ecore_evas_init_count = 0; 43static int _ecore_evas_init_count = 0;
22 44
23static char *ecore_evas_default_display = "0"; 45static char *ecore_evas_default_display = "0";
diff --git a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
index 011aeda..c323264 100644
--- a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
+++ b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
@@ -13,6 +13,28 @@
13#include <Ecore_Evas.h> 13#include <Ecore_Evas.h>
14#include "ecore_evas_private.h" 14#include "ecore_evas_private.h"
15 15
16#ifdef EAPI
17# undef EAPI
18#endif
19
20#ifdef _WIN32
21# ifdef DLL_EXPORT
22# define EAPI __declspec(dllexport)
23# else
24# define EAPI
25# endif /* ! DLL_EXPORT */
26#else
27# ifdef __GNUC__
28# if __GNUC__ >= 4
29# define EAPI __attribute__ ((visibility("default")))
30# else
31# define EAPI
32# endif
33# else
34# define EAPI
35# endif
36#endif /* ! _WIN32 */
37
16static int _ecore_evas_init_count = 0; 38static int _ecore_evas_init_count = 0;
17 39
18static Ecore_Evas *psl1ght_ee = NULL; 40static Ecore_Evas *psl1ght_ee = NULL;
diff --git a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
index 9a0e69b..0c14c89 100644
--- a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+++ b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
@@ -19,6 +19,28 @@
19 19
20#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
21#include "ecore_evas_private.h" 21#include "ecore_evas_private.h"
22
23#ifdef EAPI
24# undef EAPI
25#endif
26
27#ifdef _WIN32
28# ifdef DLL_EXPORT
29# define EAPI __declspec(dllexport)
30# else
31# define EAPI
32# endif /* ! DLL_EXPORT */
33#else
34# ifdef __GNUC__
35# if __GNUC__ >= 4
36# define EAPI __attribute__ ((visibility("default")))
37# else
38# define EAPI
39# endif
40# else
41# define EAPI
42# endif
43#endif /* ! _WIN32 */
22/* 44/*
23 * SDL only handle one window at a time. That's by definition, there is nothing wrong here. 45 * SDL only handle one window at a time. That's by definition, there is nothing wrong here.
24 * 46 *
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 6962434..4cd115c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -8,6 +8,28 @@
8# include <sys/mman.h> 8# include <sys/mman.h>
9# include <Evas_Engine_Wayland_Egl.h> 9# include <Evas_Engine_Wayland_Egl.h>
10 10
11#ifdef EAPI
12# undef EAPI
13#endif
14
15#ifdef _WIN32
16# ifdef DLL_EXPORT
17# define EAPI __declspec(dllexport)
18# else
19# define EAPI
20# endif /* ! DLL_EXPORT */
21#else
22# ifdef __GNUC__
23# if __GNUC__ >= 4
24# define EAPI __attribute__ ((visibility("default")))
25# else
26# define EAPI
27# endif
28# else
29# define EAPI
30# endif
31#endif /* ! _WIN32 */
32
11/* local function prototypes */ 33/* local function prototypes */
12static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h); 34static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h);
13static void _ecore_evas_wl_show(Ecore_Evas *ee); 35static void _ecore_evas_wl_show(Ecore_Evas *ee);
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 697813f..ce0d334 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -8,6 +8,28 @@
8# include <sys/types.h> 8# include <sys/types.h>
9# include <sys/mman.h> 9# include <sys/mman.h>
10 10
11#ifdef EAPI
12# undef EAPI
13#endif
14
15#ifdef _WIN32
16# ifdef DLL_EXPORT
17# define EAPI __declspec(dllexport)
18# else
19# define EAPI
20# endif /* ! DLL_EXPORT */
21#else
22# ifdef __GNUC__
23# if __GNUC__ >= 4
24# define EAPI __attribute__ ((visibility("default")))
25# else
26# define EAPI
27# endif
28# else
29# define EAPI
30# endif
31#endif /* ! _WIN32 */
32
11/* local function prototypes */ 33/* local function prototypes */
12static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h); 34static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h);
13static void _ecore_evas_wl_show(Ecore_Evas *ee); 35static void _ecore_evas_wl_show(Ecore_Evas *ee);
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 6af1803..72fbab4 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -27,6 +27,28 @@
27# include <Evas_Engine_Software_DDraw.h> 27# include <Evas_Engine_Software_DDraw.h>
28#endif 28#endif
29 29
30#ifdef EAPI
31# undef EAPI
32#endif
33
34#ifdef _WIN32
35# ifdef DLL_EXPORT
36# define EAPI __declspec(dllexport)
37# else
38# define EAPI
39# endif /* ! DLL_EXPORT */
40#else
41# ifdef __GNUC__
42# if __GNUC__ >= 4
43# define EAPI __attribute__ ((visibility("default")))
44# else
45# define EAPI
46# endif
47# else
48# define EAPI
49# endif
50#endif /* ! _WIN32 */
51
30#ifdef BUILD_ECORE_EVAS_WIN32 52#ifdef BUILD_ECORE_EVAS_WIN32
31 53
32#define ECORE_EVAS_EVENT_COUNT 10 54#define ECORE_EVAS_EVENT_COUNT 10
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 2d77b13..63ccfbc 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -26,6 +26,28 @@
26#include "ecore_evas_private.h" 26#include "ecore_evas_private.h"
27#include "ecore_evas_x11.h" 27#include "ecore_evas_x11.h"
28 28
29#ifdef EAPI
30# undef EAPI
31#endif
32
33#ifdef _WIN32
34# ifdef DLL_EXPORT
35# define EAPI __declspec(dllexport)
36# else
37# define EAPI
38# endif /* ! DLL_EXPORT */
39#else
40# ifdef __GNUC__
41# if __GNUC__ >= 4
42# define EAPI __attribute__ ((visibility("default")))
43# else
44# define EAPI
45# endif
46# else
47# define EAPI
48# endif
49#endif /* ! _WIN32 */
50
29#define EDBG(...) \ 51#define EDBG(...) \
30 EINA_LOG(_ecore_evas_log_dom, EINA_LOG_LEVEL_DBG + 1, __VA_ARGS__); 52 EINA_LOG(_ecore_evas_log_dom, EINA_LOG_LEVEL_DBG + 1, __VA_ARGS__);
31 53