summaryrefslogtreecommitdiff
path: root/src/lib/ector
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2017-08-15 16:42:13 +0200
committerCedric BAIL <cedric@osg.samsung.com>2017-08-15 14:13:25 -0700
commitdee65b525c387f482e0f860f87a1b3e110e3f0e3 (patch)
tree4fe5cadf20b30659ab68c3ecaa0750102837b0ec /src/lib/ector
parentf4f926f2bd69865e538d8b5259e350674562d471 (diff)
ector: fix EAPI on Windows
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/ector')
-rw-r--r--src/lib/ector/Ector.h3
-rw-r--r--src/lib/ector/cairo/Ector_Cairo.h29
-rw-r--r--src/lib/ector/gl/Ector_GL.h29
-rw-r--r--src/lib/ector/software/Ector_Software.h29
4 files changed, 90 insertions, 0 deletions
diff --git a/src/lib/ector/Ector.h b/src/lib/ector/Ector.h
index 2f479e131e..ba0efb7d89 100644
--- a/src/lib/ector/Ector.h
+++ b/src/lib/ector/Ector.h
@@ -185,4 +185,7 @@ EAPI Eina_Bool ector_glsym_set(void *(*glsym)(void *lib, const char *name), void
185} 185}
186#endif 186#endif
187 187
188#undef EAPI
189#define EAPI
190
188#endif 191#endif
diff --git a/src/lib/ector/cairo/Ector_Cairo.h b/src/lib/ector/cairo/Ector_Cairo.h
index b0c605855d..b0f0f95a4a 100644
--- a/src/lib/ector/cairo/Ector_Cairo.h
+++ b/src/lib/ector/cairo/Ector_Cairo.h
@@ -3,6 +3,32 @@
3 3
4#include <Ector.h> 4#include <Ector.h>
5 5
6#ifdef EAPI
7# undef EAPI
8#endif
9
10#ifdef _WIN32
11# ifdef EFL_ECTOR_BUILD
12# ifdef DLL_EXPORT
13# define EAPI __declspec(dllexport)
14# else
15# define EAPI
16# endif /* ! DLL_EXPORT */
17# else
18# define EAPI __declspec(dllimport)
19# endif /* ! EFL_EO_BUILD */
20#else
21# ifdef __GNUC__
22# if __GNUC__ >= 4
23# define EAPI __attribute__ ((visibility("default")))
24# else
25# define EAPI
26# endif
27# else
28# define EAPI
29# endif
30#endif /* ! _WIN32 */
31
6#ifdef EFL_BETA_API_SUPPORT 32#ifdef EFL_BETA_API_SUPPORT
7 33
8#ifndef _ECTOR_CAIRO_SURFACE_EO_CLASS_TYPE 34#ifndef _ECTOR_CAIRO_SURFACE_EO_CLASS_TYPE
@@ -23,4 +49,7 @@ typedef struct _cairo_t cairo_t;
23 49
24#endif 50#endif
25 51
52#undef EAPI
53#define EAPI
54
26#endif 55#endif
diff --git a/src/lib/ector/gl/Ector_GL.h b/src/lib/ector/gl/Ector_GL.h
index df6ece47b7..d382ac25c3 100644
--- a/src/lib/ector/gl/Ector_GL.h
+++ b/src/lib/ector/gl/Ector_GL.h
@@ -3,6 +3,32 @@
3 3
4#include <Ector.h> 4#include <Ector.h>
5 5
6#ifdef EAPI
7# undef EAPI
8#endif
9
10#ifdef _WIN32
11# ifdef EFL_ECTOR_BUILD
12# ifdef DLL_EXPORT
13# define EAPI __declspec(dllexport)
14# else
15# define EAPI
16# endif /* ! DLL_EXPORT */
17# else
18# define EAPI __declspec(dllimport)
19# endif /* ! EFL_EO_BUILD */
20#else
21# ifdef __GNUC__
22# if __GNUC__ >= 4
23# define EAPI __attribute__ ((visibility("default")))
24# else
25# define EAPI
26# endif
27# else
28# define EAPI
29# endif
30#endif /* ! _WIN32 */
31
6#ifdef EFL_BETA_API_SUPPORT 32#ifdef EFL_BETA_API_SUPPORT
7 33
8#ifndef _ECTOR_GL_SURFACE_EO_CLASS_TYPE 34#ifndef _ECTOR_GL_SURFACE_EO_CLASS_TYPE
@@ -24,4 +50,7 @@ typedef short GLshort;
24 50
25#endif 51#endif
26 52
53#undef EAPI
54#define EAPI
55
27#endif 56#endif
diff --git a/src/lib/ector/software/Ector_Software.h b/src/lib/ector/software/Ector_Software.h
index 7c94b895cf..1a43a2955f 100644
--- a/src/lib/ector/software/Ector_Software.h
+++ b/src/lib/ector/software/Ector_Software.h
@@ -3,6 +3,32 @@
3 3
4#include <Ector.h> 4#include <Ector.h>
5 5
6#ifdef EAPI
7# undef EAPI
8#endif
9
10#ifdef _WIN32
11# ifdef EFL_ECTOR_BUILD
12# ifdef DLL_EXPORT
13# define EAPI __declspec(dllexport)
14# else
15# define EAPI
16# endif /* ! DLL_EXPORT */
17# else
18# define EAPI __declspec(dllimport)
19# endif /* ! EFL_EO_BUILD */
20#else
21# ifdef __GNUC__
22# if __GNUC__ >= 4
23# define EAPI __attribute__ ((visibility("default")))
24# else
25# define EAPI
26# endif
27# else
28# define EAPI
29# endif
30#endif /* ! _WIN32 */
31
6#ifdef EFL_BETA_API_SUPPORT 32#ifdef EFL_BETA_API_SUPPORT
7 33
8#include "software/ector_software_surface.eo.h" 34#include "software/ector_software_surface.eo.h"
@@ -15,4 +41,7 @@
15 41
16#endif 42#endif
17 43
44#undef EAPI
45#define EAPI
46
18#endif 47#endif