summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertise.dev>2021-04-17 16:07:55 -0300
committerFelipe Magno de Almeida <felipe@expertise.dev>2021-04-17 16:07:56 -0300
commita331384eede6dd79610e2edcb232692055344769 (patch)
tree8db489e4e25ee6d9bca095ab208d62aa014bca56 /src
parent65d528a3798b72dbd2e01b4f37caa898af50e359 (diff)
modules: Rename EAPI macro to MODAPI for modules
Summary: Patch from a series of patches to rename EAPI symbols to specific library DSOs. = The Rationale = EAPI was designed to be able to pass `__attribute__ ((visibility ("default")))` for symbols with GCC, which would mean that even if -fvisibility=hidden was used when compiling the library, the needed symbols would get exported. MSVC __almost__ works like GCC (or mingw) in which you can declare everything as export and it will just work (slower, but it will work). But there's a caveat: global variables will not work the same way for MSVC, but works for mingw and GCC. For global variables (as opposed to functions), MSVC requires correct DSO visibility for MSVC: instead of declaring a symbol as export for everything, you need to declare it as import when importing from another DSO and export when defining it locally. With current EAPI definitions, we get the following example working in mingw and MSVC (observe it doesn't define any global variables as exported symbols). Example 1: dll1: ``` EAPI void foo(void); EAPI void bar() { foo(); } ``` dll2: ``` EAPI void foo() { printf ("foo\n"); } ``` This works fine with API defined as __declspec(dllexport) in both cases and for gcc defining as `__atttribute__((visibility("default")))`. However, the following: Example 2: dll1: ``` EAPI extern int foo; EAPI void foobar(void); EAPI void bar() { foo = 5; foobar(); } ``` dll2: ``` EAPI int foo = 0; EAPI void foobar() { printf ("foo %d\n", foo); } ``` This will work on mingw but will not work for MSVC. And that's why EAPI is the only solution that worked for MSVC. Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com> Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev> Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com> Reviewers: vtorri, jptiz, woohyun, lucas, SPAM-smith78899 Reviewed By: vtorri, SPAM-smith78899 Subscribers: SPAM-smith78899, raster, SPAM-cabanacatalogs, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12228
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/elm_module_helper.h43
-rw-r--r--src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c24
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c26
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn.c30
-rw-r--r--src/modules/ecore_evas/engines/fb/ecore_evas_fb.c24
-rw-r--r--src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c29
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c4
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c24
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c24
-rw-r--r--src/modules/ecore_evas/engines/win32/ecore_evas_win32.c26
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c34
-rw-r--r--src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c26
-rw-r--r--src/modules/elementary/access_output/mod.c16
-rw-r--r--src/modules/elementary/prefs/prefs_iface.c4
-rw-r--r--src/modules/elementary/test_entry/mod.c10
-rw-r--r--src/modules/elementary/test_map/mod.c28
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c14
-rw-r--r--src/modules/elementary/web/none/elm_web_none_eo.h2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h99
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c26
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_core.c10
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_core.h33
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_image.c14
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c12
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_shader.c2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl.h21
-rw-r--r--src/modules/evas/engines/gl_generic/meson.build1
-rw-r--r--src/modules/evas/engines/software_generic/evas_ector_software.h26
-rw-r--r--src/modules/evas/engines/software_generic/evas_native_common.h31
-rw-r--r--src/modules/evas/engines/software_generic/evas_native_tbm.c8
-rw-r--r--src/modules/evas/image_loaders/eet/evas_image_load_eet.c2
-rw-r--r--src/modules/evas/image_savers/eet/evas_image_save_eet.c2
32 files changed, 293 insertions, 382 deletions
diff --git a/src/lib/elementary/elm_module_helper.h b/src/lib/elementary/elm_module_helper.h
index eba3237266..5c2f49ebdd 100644
--- a/src/lib/elementary/elm_module_helper.h
+++ b/src/lib/elementary/elm_module_helper.h
@@ -1,43 +1,28 @@
1/* A small helper header defining EAPI for elementary modules, it should be 1/* A small helper header defining ELM_API for elementary modules, it should be
2 * included last in the modules C files. 2 * included last in the modules C files.
3 */ 3 */
4 4
5#ifndef ELM_MODULE_HELPER_H 5#ifndef ELM_MODULE_HELPER_H
6#define ELM_MODULE_HELPER_H 6#define ELM_MODULE_HELPER_H
7 7
8#ifdef EAPI
9# undef EAPI
10#endif
11#ifdef EWAPI
12# undef EWAPI
13#endif
14
15#ifdef _WIN32 8#ifdef _WIN32
16# ifdef EFL_BUILD 9# ifndef EFL_MODULE_STATIC
17# ifdef DLL_EXPORT 10# define EMODAPI __declspec(dllexport)
18# define EAPI __declspec(dllexport)
19# else
20# define EAPI
21# endif
22# else 11# else
23# define EAPI __declspec(dllimport) 12# define EMODAPI
24# endif 13# endif
25# define EAPI_WEAK 14# define EMODAPI_WEAK
26#else 15#elif defined(__GNUC__)
27# ifdef __GNUC__ 16# if __GNUC__ >= 4
28# if __GNUC__ >= 4 17# define EMODAPI __attribute__ ((visibility("default")))
29# define EAPI __attribute__ ((visibility("default"))) 18# define EMODAPI_WEAK __attribute__ ((weak))
30# define EAPI_WEAK __attribute__ ((weak))
31# else
32# define EAPI
33# define EAPI_WEAK
34# endif
35# else 19# else
36# define EAPI 20# define EMODAPI
37# define EAPI_WEAK 21# define EMODAPI_WEAK
38# endif 22# endif
23#else
24# define EMODAPI
25# define EMODAPI_WEAK
39#endif 26#endif
40 27
41#define EWAPI EAPI EAPI_WEAK
42
43#endif 28#endif
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 7018a66691..c505886e5c 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -14,18 +14,22 @@
14#include "ecore_evas_private.h" 14#include "ecore_evas_private.h"
15#include "ecore_evas_cocoa.h" 15#include "ecore_evas_cocoa.h"
16 16
17#ifdef EAPI 17#ifdef _WIN32
18# undef EAPI 18# ifndef EFL_MODULE_STATIC
19#endif 19# define EMODAPI __declspec(dllexport)
20
21#ifdef __GNUC__
22# if __GNUC__ >= 4
23# define EAPI __attribute__ ((visibility("default")))
24# else 20# else
25# define EAPI 21# define EMODAPI
26# endif 22# endif
27#else 23#else
28# define EAPI 24# ifdef __GNUC__
25# if __GNUC__ >= 4
26# define EMODAPI __attribute__ ((visibility("default")))
27# endif
28# endif
29#endif /* ! _WIN32 */
30
31#ifndef EMODAPI
32# define EMODAPI
29#endif 33#endif
30 34
31static int _ecore_evas_init_count = 0; 35static int _ecore_evas_init_count = 0;
@@ -651,7 +655,7 @@ _ecore_evas_cocoa_window_get(const Ecore_Evas *ee)
651 return (Ecore_Cocoa_Window *)(ee->prop.window); 655 return (Ecore_Cocoa_Window *)(ee->prop.window);
652} 656}
653 657
654EAPI Ecore_Evas * 658EMODAPI Ecore_Evas *
655ecore_evas_cocoa_new_internal(Ecore_Cocoa_Window *parent EINA_UNUSED, int x, int y, int w, int h) 659ecore_evas_cocoa_new_internal(Ecore_Cocoa_Window *parent EINA_UNUSED, int x, int y, int w, int h)
656{ 660{
657 Ecore_Evas *ee; 661 Ecore_Evas *ee;
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 c8f0eb8c24..b992915aaa 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -24,28 +24,24 @@
24# include <dlfcn.h> 24# include <dlfcn.h>
25#endif 25#endif
26 26
27#ifdef EAPI
28# undef EAPI
29#endif
30
31#ifdef _WIN32 27#ifdef _WIN32
32# ifdef DLL_EXPORT 28# ifndef EFL_MODULE_STATIC
33# define EAPI __declspec(dllexport) 29# define EMODAPI __declspec(dllexport)
34# else 30# else
35# define EAPI 31# define EMODAPI
36# endif /* ! DLL_EXPORT */ 32# endif
37#else 33#else
38# ifdef __GNUC__ 34# ifdef __GNUC__
39# if __GNUC__ >= 4 35# if __GNUC__ >= 4
40# define EAPI __attribute__ ((visibility("default"))) 36# define EMODAPI __attribute__ ((visibility("default")))
41# else
42# define EAPI
43# endif 37# endif
44# else
45# define EAPI
46# endif 38# endif
47#endif /* ! _WIN32 */ 39#endif /* ! _WIN32 */
48 40
41#ifndef EMODAPI
42# define EMODAPI
43#endif
44
49#define VSYNC_ANIMATOR 1 45#define VSYNC_ANIMATOR 1
50 46
51typedef struct _Ecore_Evas_Engine_Drm_Data 47typedef struct _Ecore_Evas_Engine_Drm_Data
@@ -1139,14 +1135,14 @@ eng_err:
1139 return NULL; 1135 return NULL;
1140} 1136}
1141 1137
1142EAPI Ecore_Evas * 1138EMODAPI Ecore_Evas *
1143ecore_evas_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h) 1139ecore_evas_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h)
1144{ 1140{
1145 return _ecore_evas_new_internal(device, x, y, w, h, EINA_FALSE); 1141 return _ecore_evas_new_internal(device, x, y, w, h, EINA_FALSE);
1146} 1142}
1147 1143
1148#ifdef BUILD_ECORE_EVAS_GL_DRM 1144#ifdef BUILD_ECORE_EVAS_GL_DRM
1149EAPI Ecore_Evas * 1145EMODAPI Ecore_Evas *
1150ecore_evas_gl_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h) 1146ecore_evas_gl_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h)
1151{ 1147{
1152 static void *libglapi = NULL; 1148 static void *libglapi = NULL;
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 37963fe664..65c33c0104 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -1,27 +1,23 @@
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 3#ifdef _WIN32
8# ifdef DLL_EXPORT 4# ifndef EFL_MODULE_STATIC
9# define EAPI __declspec(dllexport) 5# define EMODAPI __declspec(dllexport)
10# else 6# else
11# define EAPI 7# define EMODAPI
12# endif /* ! DLL_EXPORT */ 8# endif
13#else 9#else
14# ifdef __GNUC__ 10# ifdef __GNUC__
15# if __GNUC__ >= 4 11# if __GNUC__ >= 4
16# define EAPI __attribute__ ((visibility("default"))) 12# define EMODAPI __attribute__ ((visibility("default")))
17# else
18# define EAPI
19# endif 13# endif
20# else
21# define EAPI
22# endif 14# endif
23#endif /* ! _WIN32 */ 15#endif /* ! _WIN32 */
24 16
17#ifndef EMODAPI
18# define EMODAPI
19#endif
20
25#define NBUF 2 21#define NBUF 2
26 22
27static int blank = 0x00000000; 23static int blank = 0x00000000;
@@ -1184,7 +1180,7 @@ _ipc_server_data(void *data, int type EINA_UNUSED, void *event)
1184 return ECORE_CALLBACK_PASS_ON; 1180 return ECORE_CALLBACK_PASS_ON;
1185} 1181}
1186 1182
1187EAPI Evas_Object * 1183EMODAPI Evas_Object *
1188ecore_evas_extn_plug_new_internal(Ecore_Evas *ee_target) 1184ecore_evas_extn_plug_new_internal(Ecore_Evas *ee_target)
1189{ 1185{
1190 Evas_Object *o; 1186 Evas_Object *o;
@@ -2118,7 +2114,7 @@ static const Ecore_Evas_Engine_Func _ecore_extn_socket_engine_func =
2118 NULL //fn_last_tick_get 2114 NULL //fn_last_tick_get
2119}; 2115};
2120 2116
2121EAPI Ecore_Evas * 2117EMODAPI Ecore_Evas *
2122ecore_evas_extn_socket_new_internal(int w, int h) 2118ecore_evas_extn_socket_new_internal(int w, int h)
2123{ 2119{
2124 Evas_Engine_Info_Buffer *einfo; 2120 Evas_Engine_Info_Buffer *einfo;
@@ -2325,13 +2321,13 @@ _ecore_evas_extn_interface_new(void)
2325 return iface; 2321 return iface;
2326} 2322}
2327 2323
2328EAPI void 2324EMODAPI void
2329ecore_evas_extn_socket_events_block_set_internal(Ecore_Evas *ee, Eina_Bool events_block) 2325ecore_evas_extn_socket_events_block_set_internal(Ecore_Evas *ee, Eina_Bool events_block)
2330{ 2326{
2331 ee->events_block = events_block; 2327 ee->events_block = events_block;
2332} 2328}
2333 2329
2334EAPI Eina_Bool 2330EMODAPI Eina_Bool
2335ecore_evas_extn_socket_events_block_get_internal(Ecore_Evas *ee) 2331ecore_evas_extn_socket_events_block_get_internal(Ecore_Evas *ee)
2336{ 2332{
2337 return ee->events_block; 2333 return ee->events_block;
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 ce671e2e3e..d92979abb6 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -17,28 +17,24 @@
17#include "ecore_evas_private.h" 17#include "ecore_evas_private.h"
18#include <Evas_Engine_FB.h> 18#include <Evas_Engine_FB.h>
19 19
20#ifdef EAPI
21# undef EAPI
22#endif
23
24#ifdef _WIN32 20#ifdef _WIN32
25# ifdef DLL_EXPORT 21# ifndef EFL_MODULE_STATIC
26# define EAPI __declspec(dllexport) 22# define EMODAPI __declspec(dllexport)
27# else 23# else
28# define EAPI 24# define EMODAPI
29# endif /* ! DLL_EXPORT */ 25# endif
30#else 26#else
31# ifdef __GNUC__ 27# ifdef __GNUC__
32# if __GNUC__ >= 4 28# if __GNUC__ >= 4
33# define EAPI __attribute__ ((visibility("default"))) 29# define EMODAPI __attribute__ ((visibility("default")))
34# else
35# define EAPI
36# endif 30# endif
37# else
38# define EAPI
39# endif 31# endif
40#endif /* ! _WIN32 */ 32#endif /* ! _WIN32 */
41 33
34#ifndef EMODAPI
35# define EMODAPI
36#endif
37
42static int _ecore_evas_init_count = 0; 38static int _ecore_evas_init_count = 0;
43 39
44static char *ecore_evas_default_display = "0"; 40static char *ecore_evas_default_display = "0";
@@ -564,7 +560,7 @@ static Ecore_Evas_Engine_Func _ecore_fb_engine_func =
564 NULL, //fn_last_tick_get 560 NULL, //fn_last_tick_get
565}; 561};
566 562
567EAPI Ecore_Evas * 563EMODAPI Ecore_Evas *
568ecore_evas_fb_new_internal(const char *disp_name, int rotation, int w, int h) 564ecore_evas_fb_new_internal(const char *disp_name, int rotation, int w, int h)
569{ 565{
570 Evas_Engine_Info_FB *einfo; 566 Evas_Engine_Info_FB *einfo;
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 ef4ba057b9..cb6e6e831a 100644
--- a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+++ b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
@@ -20,27 +20,24 @@
20#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
21#include "ecore_evas_private.h" 21#include "ecore_evas_private.h"
22 22
23#ifdef EAPI
24# undef EAPI
25#endif
26
27#ifdef _WIN32 23#ifdef _WIN32
28# ifdef DLL_EXPORT 24# ifndef EFL_MODULE_STATIC
29# define EAPI __declspec(dllexport) 25# define EMODAPI __declspec(dllexport)
30# else 26# else
31# define EAPI 27# define EMODAPI
32# endif /* ! DLL_EXPORT */ 28# endif
33#else 29#else
34# ifdef __GNUC__ 30# ifdef __GNUC__
35# if __GNUC__ >= 4 31# if __GNUC__ >= 4
36# define EAPI __attribute__ ((visibility("default"))) 32# define EMODAPI __attribute__ ((visibility("default")))
37# else
38# define EAPI
39# endif 33# endif
40# else
41# define EAPI
42# endif 34# endif
43#endif /* ! _WIN32 */ 35#endif /* ! _WIN32 */
36
37#ifndef EMODAPI
38# define EMODAPI
39#endif
40
44/* 41/*
45 * SDL only handle one window at a time. That's by definition, there is nothing wrong here. 42 * SDL only handle one window at a time. That's by definition, there is nothing wrong here.
46 * 43 *
@@ -631,7 +628,7 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
631 return NULL; 628 return NULL;
632} 629}
633 630
634EAPI Ecore_Evas * 631EMODAPI Ecore_Evas *
635ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen, 632ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen,
636 int hwsurface, int noframe, int alpha) 633 int hwsurface, int noframe, int alpha)
637{ 634{
@@ -645,7 +642,7 @@ ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen,
645 return ee; 642 return ee;
646} 643}
647 644
648EAPI Ecore_Evas* 645EMODAPI Ecore_Evas*
649ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int fullscreen EINA_UNUSED, int hwsurface EINA_UNUSED, int noframe EINA_UNUSED, int alpha EINA_UNUSED) 646ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int fullscreen EINA_UNUSED, int hwsurface EINA_UNUSED, int noframe EINA_UNUSED, int alpha EINA_UNUSED)
650{ 647{
651 ERR("OUCH !"); 648 ERR("OUCH !");
@@ -653,7 +650,7 @@ ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, i
653} 650}
654 651
655#ifdef BUILD_ECORE_EVAS_OPENGL_SDL 652#ifdef BUILD_ECORE_EVAS_OPENGL_SDL
656EAPI Ecore_Evas * 653EMODAPI Ecore_Evas *
657ecore_evas_gl_sdl_new_internal(const char* name, int w, int h, int fullscreen, int noframe) 654ecore_evas_gl_sdl_new_internal(const char* name, int w, int h, int fullscreen, int noframe)
658{ 655{
659 Ecore_Evas *ee; 656 Ecore_Evas *ee;
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 1cec016ebc..e9569f650d 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -6,8 +6,8 @@
6#include <Evas_Engine_Wayland.h> 6#include <Evas_Engine_Wayland.h>
7#include "ecore_wl2_internal.h" 7#include "ecore_wl2_internal.h"
8 8
9EAPI extern Eina_List *_evas_canvas_image_data_unset(Evas *eo_e); 9EMODAPI extern Eina_List *_evas_canvas_image_data_unset(Evas *eo_e);
10EAPI extern void _evas_canvas_image_data_regenerate(Eina_List *list); 10EMODAPI extern void _evas_canvas_image_data_regenerate(Eina_List *list);
11 11
12#define _smart_frame_type "ecore_evas_wl_frame" 12#define _smart_frame_type "ecore_evas_wl_frame"
13 13
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 fd9415de41..5e08c33a7b 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
@@ -5,30 +5,26 @@
5# include <string.h> 5# include <string.h>
6# include <unistd.h> 6# include <unistd.h>
7 7
8#ifdef EAPI
9# undef EAPI
10#endif
11
12#ifdef _WIN32 8#ifdef _WIN32
13# ifdef DLL_EXPORT 9# ifndef EFL_MODULE_STATIC
14# define EAPI __declspec(dllexport) 10# define EMODAPI __declspec(dllexport)
15# else 11# else
16# define EAPI 12# define EMODAPI
17# endif /* ! DLL_EXPORT */ 13# endif
18#else 14#else
19# ifdef __GNUC__ 15# ifdef __GNUC__
20# if __GNUC__ >= 4 16# if __GNUC__ >= 4
21# define EAPI __attribute__ ((visibility("default"))) 17# define EMODAPI __attribute__ ((visibility("default")))
22# else
23# define EAPI
24# endif 18# endif
25# else
26# define EAPI
27# endif 19# endif
28#endif /* ! _WIN32 */ 20#endif /* ! _WIN32 */
29 21
22#ifndef EMODAPI
23# define EMODAPI
24#endif
25
30/* external functions */ 26/* external functions */
31EAPI Ecore_Evas * 27EMODAPI Ecore_Evas *
32ecore_evas_wayland_egl_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame, const int *opt) 28ecore_evas_wayland_egl_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame, const int *opt)
33{ 29{
34 LOGFN; 30 LOGFN;
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 1481bf6f2b..6db7403cc0 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
@@ -5,30 +5,26 @@
5# include <string.h> 5# include <string.h>
6# include <unistd.h> 6# include <unistd.h>
7 7
8#ifdef EAPI
9# undef EAPI
10#endif
11
12#ifdef _WIN32 8#ifdef _WIN32
13# ifdef DLL_EXPORT 9# ifndef EFL_MODULE_STATIC
14# define EAPI __declspec(dllexport) 10# define EMODAPI __declspec(dllexport)
15# else 11# else
16# define EAPI 12# define EMODAPI
17# endif /* ! DLL_EXPORT */ 13# endif
18#else 14#else
19# ifdef __GNUC__ 15# ifdef __GNUC__
20# if __GNUC__ >= 4 16# if __GNUC__ >= 4
21# define EAPI __attribute__ ((visibility("default"))) 17# define EMODAPI __attribute__ ((visibility("default")))
22# else
23# define EAPI
24# endif 18# endif
25# else
26# define EAPI
27# endif 19# endif
28#endif /* ! _WIN32 */ 20#endif /* ! _WIN32 */
29 21
22#ifndef EMODAPI
23# define EMODAPI
24#endif
25
30/* external functions */ 26/* external functions */
31EAPI Ecore_Evas * 27EMODAPI Ecore_Evas *
32ecore_evas_wayland_shm_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame) 28ecore_evas_wayland_shm_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame)
33{ 29{
34 LOGFN; 30 LOGFN;
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 623515da95..ca1ddc0ddb 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -28,28 +28,24 @@
28# include <Evas_Engine_Software_DDraw.h> 28# include <Evas_Engine_Software_DDraw.h>
29#endif 29#endif
30 30
31#ifdef EAPI
32# undef EAPI
33#endif
34
35#ifdef _WIN32 31#ifdef _WIN32
36# ifdef DLL_EXPORT 32# ifndef EFL_MODULE_STATIC
37# define EAPI __declspec(dllexport) 33# define EMODAPI __declspec(dllexport)
38# else 34# else
39# define EAPI 35# define EMODAPI
40# endif /* ! DLL_EXPORT */ 36# endif
41#else 37#else
42# ifdef __GNUC__ 38# ifdef __GNUC__
43# if __GNUC__ >= 4 39# if __GNUC__ >= 4
44# define EAPI __attribute__ ((visibility("default"))) 40# define EMODAPI __attribute__ ((visibility("default")))
45# else
46# define EAPI
47# endif 41# endif
48# else
49# define EAPI
50# endif 42# endif
51#endif /* ! _WIN32 */ 43#endif /* ! _WIN32 */
52 44
45#ifndef EMODAPI
46# define EMODAPI
47#endif
48
53#ifdef BUILD_ECORE_EVAS_WIN32 49#ifdef BUILD_ECORE_EVAS_WIN32
54 50
55#define ECORE_EVAS_EVENT_COUNT 11 51#define ECORE_EVAS_EVENT_COUNT 11
@@ -1636,7 +1632,7 @@ _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_backend_init)(Ecore_Evas
1636 return ee; 1632 return ee;
1637} 1633}
1638 1634
1639EAPI Ecore_Evas * 1635EMODAPI Ecore_Evas *
1640ecore_evas_software_gdi_new_internal(Ecore_Win32_Window *parent, 1636ecore_evas_software_gdi_new_internal(Ecore_Win32_Window *parent,
1641 int x, 1637 int x,
1642 int y, 1638 int y,
@@ -1660,7 +1656,7 @@ ecore_evas_software_gdi_new_internal(Ecore_Win32_Window *parent,
1660#endif 1656#endif
1661} 1657}
1662 1658
1663EAPI Ecore_Evas * 1659EMODAPI Ecore_Evas *
1664ecore_evas_software_ddraw_new_internal(Ecore_Win32_Window *parent, 1660ecore_evas_software_ddraw_new_internal(Ecore_Win32_Window *parent,
1665 int x, 1661 int x,
1666 int y, 1662 int y,
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 bb5f02c853..c75af6368f 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -27,28 +27,24 @@
27#include "ecore_evas_private.h" 27#include "ecore_evas_private.h"
28#include "ecore_evas_x11.h" 28#include "ecore_evas_x11.h"
29 29
30#ifdef EAPI
31# undef EAPI
32#endif
33
34#ifdef _WIN32 30#ifdef _WIN32
35# ifdef DLL_EXPORT 31# ifndef EFL_MODULE_STATIC
36# define EAPI __declspec(dllexport) 32# define EMODAPI __declspec(dllexport)
37# else 33# else
38# define EAPI 34# define EMODAPI
39# endif /* ! DLL_EXPORT */ 35# endif
40#else 36#else
41# ifdef __GNUC__ 37# ifdef __GNUC__
42# if __GNUC__ >= 4 38# if __GNUC__ >= 4
43# define EAPI __attribute__ ((visibility("default"))) 39# define EMODAPI __attribute__ ((visibility("default")))
44# else
45# define EAPI
46# endif 40# endif
47# else
48# define EAPI
49# endif 41# endif
50#endif /* ! _WIN32 */ 42#endif /* ! _WIN32 */
51 43
44#ifndef EMODAPI
45# define EMODAPI
46#endif
47
52#define ECORE_EVAS_X11_SELECTION 0x7F 48#define ECORE_EVAS_X11_SELECTION 0x7F
53 49
54#define EDBG(...) \ 50#define EDBG(...) \
@@ -1943,7 +1939,7 @@ _ecore_evas_x_layer_update(Ecore_Evas *ee)
1943 /* FIXME: Set gnome layer */ 1939 /* FIXME: Set gnome layer */
1944} 1940}
1945 1941
1946EAPI void ecore_x_window_root_properties_select(void); 1942EMODAPI void ecore_x_window_root_properties_select(void);
1947 1943
1948static int 1944static int
1949_ecore_evas_x_init(void) 1945_ecore_evas_x_init(void)
@@ -4760,7 +4756,7 @@ _ecore_evas_x_flush_post(void *data, Evas *e EINA_UNUSED, void *event_info EINA_
4760#endif 4756#endif
4761 4757
4762#ifdef BUILD_ECORE_EVAS_SOFTWARE_X11 4758#ifdef BUILD_ECORE_EVAS_SOFTWARE_X11
4763EAPI Ecore_Evas * 4759EMODAPI Ecore_Evas *
4764ecore_evas_software_x11_new_internal(const char *disp_name, Ecore_X_Window parent, 4760ecore_evas_software_x11_new_internal(const char *disp_name, Ecore_X_Window parent,
4765 int x, int y, int w, int h) 4761 int x, int y, int w, int h)
4766{ 4762{
@@ -4963,7 +4959,7 @@ ecore_evas_software_x11_new_internal(const char *disp_name, Ecore_X_Window paren
4963 return ee; 4959 return ee;
4964} 4960}
4965 4961
4966EAPI Ecore_Evas * 4962EMODAPI Ecore_Evas *
4967ecore_evas_software_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window parent, 4963ecore_evas_software_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window parent,
4968 int x, int y, int w, int h) 4964 int x, int y, int w, int h)
4969{ 4965{
@@ -5277,7 +5273,7 @@ _ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window w
5277#endif 5273#endif
5278 5274
5279#ifdef BUILD_ECORE_EVAS_OPENGL_X11 5275#ifdef BUILD_ECORE_EVAS_OPENGL_X11
5280EAPI Ecore_Evas * 5276EMODAPI Ecore_Evas *
5281ecore_evas_gl_x11_options_new_internal(const char *disp_name, Ecore_X_Window parent, 5277ecore_evas_gl_x11_options_new_internal(const char *disp_name, Ecore_X_Window parent,
5282 int x, int y, int w, int h, const int *opt) 5278 int x, int y, int w, int h, const int *opt)
5283{ 5279{
@@ -5401,14 +5397,14 @@ ecore_evas_gl_x11_options_new_internal(const char *disp_name, Ecore_X_Window par
5401 return ee; 5397 return ee;
5402} 5398}
5403 5399
5404EAPI Ecore_Evas * 5400EMODAPI Ecore_Evas *
5405ecore_evas_gl_x11_new_internal(const char *disp_name, Ecore_X_Window parent, 5401ecore_evas_gl_x11_new_internal(const char *disp_name, Ecore_X_Window parent,
5406 int x, int y, int w, int h) 5402 int x, int y, int w, int h)
5407{ 5403{
5408 return ecore_evas_gl_x11_options_new_internal(disp_name, parent, x, y, w, h, NULL); 5404 return ecore_evas_gl_x11_options_new_internal(disp_name, parent, x, y, w, h, NULL);
5409} 5405}
5410 5406
5411EAPI Ecore_Evas * 5407EMODAPI Ecore_Evas *
5412ecore_evas_gl_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window parent, 5408ecore_evas_gl_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window parent,
5413 int x, int y, int w, int h) 5409 int x, int y, int w, int h)
5414{ 5410{
diff --git a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
index c2a392400c..83e5e9137b 100644
--- a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
+++ b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
@@ -24,28 +24,24 @@
24static int _ecore_evas_vnc_server_log_dom; 24static int _ecore_evas_vnc_server_log_dom;
25static unsigned int _available_seat = 1; 25static unsigned int _available_seat = 1;
26 26
27#ifdef EAPI
28# undef EAPI
29#endif
30
31#ifdef _WIN32 27#ifdef _WIN32
32# ifdef DLL_EXPORT 28# ifndef EFL_MODULE_STATIC
33# define EAPI __declspec(dllexport) 29# define EMODAPI __declspec(dllexport)
34# else 30# else
35# define EAPI 31# define EMODAPI
36# endif /* ! DLL_EXPORT */ 32# endif
37#else 33#else
38# ifdef __GNUC__ 34# ifdef __GNUC__
39# if __GNUC__ >= 4 35# if __GNUC__ >= 4
40# define EAPI __attribute__ ((visibility("default"))) 36# define EMODAPI __attribute__ ((visibility("default")))
41# else
42# define EAPI
43# endif 37# endif
44# else
45# define EAPI
46# endif 38# endif
47#endif /* ! _WIN32 */ 39#endif /* ! _WIN32 */
48 40
41#ifndef EMODAPI
42# define EMODAPI
43#endif
44
49#ifdef WRN 45#ifdef WRN
50#undef WRN 46#undef WRN
51#endif 47#endif
@@ -732,7 +728,7 @@ _ecore_evas_vnc_server_del(void *data, const Efl_Event *ev EINA_UNUSED)
732 free(server); 728 free(server);
733} 729}
734 730
735EAPI Evas_Object * 731EMODAPI Evas_Object *
736ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr, 732ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr,
737 Ecore_Evas_Vnc_Client_Accept_Cb accept_cb, 733 Ecore_Evas_Vnc_Client_Accept_Cb accept_cb,
738 Ecore_Evas_Vnc_Client_Disconnected_Cb disc_cb, 734 Ecore_Evas_Vnc_Client_Disconnected_Cb disc_cb,
@@ -834,7 +830,7 @@ ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr,
834 return NULL; 830 return NULL;
835} 831}
836 832
837EAPI Eina_Bool 833EMODAPI Eina_Bool
838ecore_evas_vnc_server_pointer_xy_get(const Evas_Object *snapshot, 834ecore_evas_vnc_server_pointer_xy_get(const Evas_Object *snapshot,
839 const Evas_Device *pointer, 835 const Evas_Device *pointer,
840 Evas_Coord *x, Evas_Coord *y) 836 Evas_Coord *x, Evas_Coord *y)
diff --git a/src/modules/elementary/access_output/mod.c b/src/modules/elementary/access_output/mod.c
index cabf0a6a55..54d877ab53 100644
--- a/src/modules/elementary/access_output/mod.c
+++ b/src/modules/elementary/access_output/mod.c
@@ -4,10 +4,6 @@
4 4
5#include "Elementary.h" 5#include "Elementary.h"
6 6
7#ifndef EFL_BUILD
8# define EFL_BUILD
9#endif
10#undef ELM_MODULE_HELPER_H
11#include "elm_module_helper.h" 7#include "elm_module_helper.h"
12 8
13/* to enable this module 9/* to enable this module
@@ -44,7 +40,7 @@ _exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
44} 40}
45 41
46// module api funcs needed 42// module api funcs needed
47EAPI int 43EMODAPI int
48elm_modapi_init(void *m EINA_UNUSED) 44elm_modapi_init(void *m EINA_UNUSED)
49{ 45{
50 exe_exit_handler = 46 exe_exit_handler =
@@ -53,7 +49,7 @@ elm_modapi_init(void *m EINA_UNUSED)
53 return 1; // succeed always 49 return 1; // succeed always
54} 50}
55 51
56EAPI int 52EMODAPI int
57elm_modapi_shutdown(void *m EINA_UNUSED) 53elm_modapi_shutdown(void *m EINA_UNUSED)
58{ 54{
59 if (exe_exit_handler) 55 if (exe_exit_handler)
@@ -65,7 +61,7 @@ elm_modapi_shutdown(void *m EINA_UNUSED)
65} 61}
66 62
67// module fucns for the specific module type 63// module fucns for the specific module type
68EAPI void 64EMODAPI void
69out_read(const char *txt) 65out_read(const char *txt)
70{ 66{
71 if (!tmpf) 67 if (!tmpf)
@@ -80,7 +76,7 @@ out_read(const char *txt)
80 if (write(tmpfd, txt, strlen(txt)) < 0) perror("write to tmpfile (espeak)"); 76 if (write(tmpfd, txt, strlen(txt)) < 0) perror("write to tmpfile (espeak)");
81} 77}
82 78
83EAPI void 79EMODAPI void
84out_read_done(void) 80out_read_done(void)
85{ 81{
86 char buf[PATH_MAX]; 82 char buf[PATH_MAX];
@@ -103,7 +99,7 @@ out_read_done(void)
103 } 99 }
104} 100}
105 101
106EAPI void 102EMODAPI void
107out_cancel(void) 103out_cancel(void)
108{ 104{
109 if (espeak) 105 if (espeak)
@@ -121,7 +117,7 @@ out_cancel(void)
121 } 117 }
122} 118}
123 119
124EAPI void 120EMODAPI void
125out_done_callback_set(void (*func) (void *data), const void *data) 121out_done_callback_set(void (*func) (void *data), const void *data)
126{ 122{
127 cb_func = func; 123 cb_func = func;
diff --git a/src/modules/elementary/prefs/prefs_iface.c b/src/modules/elementary/prefs/prefs_iface.c
index d09658a052..e0301b1983 100644
--- a/src/modules/elementary/prefs/prefs_iface.c
+++ b/src/modules/elementary/prefs/prefs_iface.c
@@ -267,7 +267,7 @@ elm_prefs_page_common_unpack(Evas_Object *it,
267 elm_box_unpack(obj, it); 267 elm_box_unpack(obj, it);
268} 268}
269 269
270EAPI int 270EMODAPI int
271elm_modapi_init(void *m EINA_UNUSED) 271elm_modapi_init(void *m EINA_UNUSED)
272{ 272{
273 _elm_prefs_log_dom = eina_log_domain_register 273 _elm_prefs_log_dom = eina_log_domain_register
@@ -279,7 +279,7 @@ elm_modapi_init(void *m EINA_UNUSED)
279 return 1; // succeed always 279 return 1; // succeed always
280} 280}
281 281
282EAPI int 282EMODAPI int
283elm_modapi_shutdown(void *m EINA_UNUSED) 283elm_modapi_shutdown(void *m EINA_UNUSED)
284{ 284{
285 elm_prefs_item_iface_unregister(_elm_prefs_item_widgets); 285 elm_prefs_item_iface_unregister(_elm_prefs_item_widgets);
diff --git a/src/modules/elementary/test_entry/mod.c b/src/modules/elementary/test_entry/mod.c
index b80cb182ce..3edab2204c 100644
--- a/src/modules/elementary/test_entry/mod.c
+++ b/src/modules/elementary/test_entry/mod.c
@@ -11,32 +11,32 @@
11#include "elm_module_helper.h" 11#include "elm_module_helper.h"
12 12
13// module api funcs needed 13// module api funcs needed
14EAPI int 14EMODAPI int
15elm_modapi_init(void *m EINA_UNUSED) 15elm_modapi_init(void *m EINA_UNUSED)
16{ 16{
17 return 1; // succeed always 17 return 1; // succeed always
18} 18}
19 19
20EAPI int 20EMODAPI int
21elm_modapi_shutdown(void *m EINA_UNUSED) 21elm_modapi_shutdown(void *m EINA_UNUSED)
22{ 22{
23 return 1; // succeed always 23 return 1; // succeed always
24} 24}
25 25
26// module fucns for the specific module type 26// module fucns for the specific module type
27EAPI void 27EMODAPI void
28obj_hook(Evas_Object *obj) 28obj_hook(Evas_Object *obj)
29{ 29{
30 printf("hook: %p\n", obj); 30 printf("hook: %p\n", obj);
31} 31}
32 32
33EAPI void 33EMODAPI void
34obj_unhook(Evas_Object *obj) 34obj_unhook(Evas_Object *obj)
35{ 35{
36 printf("unhook: %p\n", obj); 36 printf("unhook: %p\n", obj);
37} 37}
38 38
39EAPI void 39EMODAPI void
40obj_longpress(Evas_Object *obj) 40obj_longpress(Evas_Object *obj)
41{ 41{
42 printf("longpress: %p\n", obj); 42 printf("longpress: %p\n", obj);
diff --git a/src/modules/elementary/test_map/mod.c b/src/modules/elementary/test_map/mod.c
index 15c4ff3344..601acbaf42 100644
--- a/src/modules/elementary/test_map/mod.c
+++ b/src/modules/elementary/test_map/mod.c
@@ -12,25 +12,25 @@
12#undef ELM_MODULE_HELPER_H 12#undef ELM_MODULE_HELPER_H
13#include "elm_module_helper.h" 13#include "elm_module_helper.h"
14 14
15EAPI Eina_Stringshare * 15EMODAPI Eina_Stringshare *
16map_module_source_name_get(void) 16map_module_source_name_get(void)
17{ 17{
18 return eina_stringshare_add("test_map"); 18 return eina_stringshare_add("test_map");
19} 19}
20 20
21EAPI int 21EMODAPI int
22map_module_tile_zoom_min_get(void) 22map_module_tile_zoom_min_get(void)
23{ 23{
24 return 0; 24 return 0;
25} 25}
26 26
27EAPI int 27EMODAPI int
28map_module_tile_zoom_max_get(void) 28map_module_tile_zoom_max_get(void)
29{ 29{
30 return 18; 30 return 18;
31} 31}
32 32
33EAPI char * 33EMODAPI char *
34map_module_tile_url_get(Evas_Object *obj EINA_UNUSED, int x, int y, int zoom) 34map_module_tile_url_get(Evas_Object *obj EINA_UNUSED, int x, int y, int zoom)
35{ 35{
36 char buf[PATH_MAX]; 36 char buf[PATH_MAX];
@@ -39,61 +39,61 @@ map_module_tile_url_get(Evas_Object *obj EINA_UNUSED, int x, int y, int zoom)
39 return strdup(buf); 39 return strdup(buf);
40} 40}
41 41
42EAPI char * 42EMODAPI char *
43map_module_route_source_get(void) 43map_module_route_source_get(void)
44{ 44{
45 return NULL; 45 return NULL;
46} 46}
47 47
48EAPI void 48EMODAPI void
49map_module_route_source_parse(Elm_Map_Route *r EINA_UNUSED) 49map_module_route_source_parse(Elm_Map_Route *r EINA_UNUSED)
50{ 50{
51 return; 51 return;
52} 52}
53 53
54EAPI char * 54EMODAPI char *
55map_module_route_url_get(Evas_Object *obj EINA_UNUSED, const char *type_name EINA_UNUSED, int method EINA_UNUSED, double flon EINA_UNUSED, double flat EINA_UNUSED, double tlon EINA_UNUSED, double tlat EINA_UNUSED) 55map_module_route_url_get(Evas_Object *obj EINA_UNUSED, const char *type_name EINA_UNUSED, int method EINA_UNUSED, double flon EINA_UNUSED, double flat EINA_UNUSED, double tlon EINA_UNUSED, double tlat EINA_UNUSED)
56{ 56{
57 return strdup(""); 57 return strdup("");
58} 58}
59 59
60EAPI char * 60EMODAPI char *
61map_module_name_url_get(Evas_Object *obj EINA_UNUSED, int method EINA_UNUSED, const char *name EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED) 61map_module_name_url_get(Evas_Object *obj EINA_UNUSED, int method EINA_UNUSED, const char *name EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED)
62{ 62{
63 return strdup(""); 63 return strdup("");
64} 64}
65 65
66EAPI void 66EMODAPI void
67map_module_name_source_parse(Elm_Map_Name *n EINA_UNUSED) 67map_module_name_source_parse(Elm_Map_Name *n EINA_UNUSED)
68{ 68{
69 return; 69 return;
70} 70}
71 71
72EAPI void 72EMODAPI void
73map_module_name_list_source_parse(Elm_Map_Name_List *nl EINA_UNUSED) 73map_module_name_list_source_parse(Elm_Map_Name_List *nl EINA_UNUSED)
74{ 74{
75 return; 75 return;
76} 76}
77 77
78EAPI Eina_Bool 78EMODAPI Eina_Bool
79map_module_tile_geo_to_coord(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int size EINA_UNUSED, int *x EINA_UNUSED, int *y EINA_UNUSED) 79map_module_tile_geo_to_coord(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int size EINA_UNUSED, int *x EINA_UNUSED, int *y EINA_UNUSED)
80{ 80{
81 return EINA_FALSE; 81 return EINA_FALSE;
82} 82}
83 83
84EAPI Eina_Bool 84EMODAPI Eina_Bool
85map_module_tile_coord_to_geo(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int size EINA_UNUSED, double *lon EINA_UNUSED, double *lat EINA_UNUSED) 85map_module_tile_coord_to_geo(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int size EINA_UNUSED, double *lon EINA_UNUSED, double *lat EINA_UNUSED)
86{ 86{
87 return EINA_FALSE; 87 return EINA_FALSE;
88} 88}
89 89
90EAPI double 90EMODAPI double
91map_module_tile_scale_get(const Evas_Object *obj EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int zoom EINA_UNUSED) 91map_module_tile_scale_get(const Evas_Object *obj EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int zoom EINA_UNUSED)
92{ 92{
93 return 0; 93 return 0;
94} 94}
95 95
96EAPI Evas_Object * 96EMODAPI Evas_Object *
97map_module_tile_copyright_get(Evas_Object *obj EINA_UNUSED) 97map_module_tile_copyright_get(Evas_Object *obj EINA_UNUSED)
98{ 98{
99 return NULL; 99 return NULL;
diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index 88218462dc..45cd773242 100644
--- a/src/modules/elementary/web/none/elm_web_none.c
+++ b/src/modules/elementary/web/none/elm_web_none.c
@@ -309,24 +309,24 @@ _elm_web_none_elm_web_inwin_mode_get(const Eo *obj EINA_UNUSED, Elm_Web_None_Dat
309 return EINA_FALSE; 309 return EINA_FALSE;
310} 310}
311 311
312EAPI void 312EMODAPI void
313ewm_window_features_ref(Elm_Web_Window_Features *wf EINA_UNUSED) 313ewm_window_features_ref(Elm_Web_Window_Features *wf EINA_UNUSED)
314{ 314{
315} 315}
316 316
317EAPI void 317EMODAPI void
318ewm_window_features_unref(Elm_Web_Window_Features *wf EINA_UNUSED) 318ewm_window_features_unref(Elm_Web_Window_Features *wf EINA_UNUSED)
319{ 319{
320} 320}
321 321
322EAPI Eina_Bool 322EMODAPI Eina_Bool
323ewm_window_features_property_get(const Elm_Web_Window_Features *wf EINA_UNUSED, 323ewm_window_features_property_get(const Elm_Web_Window_Features *wf EINA_UNUSED,
324 Elm_Web_Window_Feature_Flag flag EINA_UNUSED) 324 Elm_Web_Window_Feature_Flag flag EINA_UNUSED)
325{ 325{
326 return EINA_FALSE; 326 return EINA_FALSE;
327} 327}
328 328
329EAPI void 329EMODAPI void
330ewm_window_features_region_get(const Elm_Web_Window_Features *wf EINA_UNUSED, 330ewm_window_features_region_get(const Elm_Web_Window_Features *wf EINA_UNUSED,
331 Evas_Coord *x, 331 Evas_Coord *x,
332 Evas_Coord *y, 332 Evas_Coord *y,
@@ -339,12 +339,12 @@ ewm_window_features_region_get(const Elm_Web_Window_Features *wf EINA_UNUSED,
339 if (h) *h = 0; 339 if (h) *h = 0;
340} 340}
341 341
342EAPI void 342EMODAPI void
343ewm_unneed_web(void) 343ewm_unneed_web(void)
344{ 344{
345} 345}
346 346
347EAPI Eina_Bool 347EMODAPI Eina_Bool
348ewm_need_web(void) 348ewm_need_web(void)
349{ 349{
350 if (_none_log_dom == -1) 350 if (_none_log_dom == -1)
@@ -352,7 +352,7 @@ ewm_need_web(void)
352 return EINA_TRUE; 352 return EINA_TRUE;
353} 353}
354 354
355EAPI const Efl_Class * 355EMODAPI const Efl_Class *
356ewm_class_get(void) 356ewm_class_get(void)
357{ 357{
358 return elm_web_none_class_get(); 358 return elm_web_none_class_get();
diff --git a/src/modules/elementary/web/none/elm_web_none_eo.h b/src/modules/elementary/web/none/elm_web_none_eo.h
index df91907d17..21097be917 100644
--- a/src/modules/elementary/web/none/elm_web_none_eo.h
+++ b/src/modules/elementary/web/none/elm_web_none_eo.h
@@ -19,6 +19,6 @@ typedef Eo Elm_Web_None;
19 */ 19 */
20#define ELM_WEB_NONE_CLASS elm_web_none_class_get() 20#define ELM_WEB_NONE_CLASS elm_web_none_class_get()
21 21
22EWAPI const Efl_Class *elm_web_none_class_get(void) EINA_CONST; 22EMODAPI EMODAPI_WEAK const Efl_Class *elm_web_none_class_get(void) EINA_CONST;
23 23
24#endif 24#endif
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index baa1660d66..14364ae9d3 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -74,29 +74,25 @@ typedef struct _Evas_GL_Filter Evas_GL_Filter;
74 74
75typedef Eina_Bool (*evas_gl_make_current_cb)(void *engine_data, void *doit); 75typedef Eina_Bool (*evas_gl_make_current_cb)(void *engine_data, void *doit);
76 76
77#ifdef EAPI
78# undef EAPI
79#endif
80
81#ifdef _WIN32 77#ifdef _WIN32
82# ifdef EFL_BUILD 78# ifndef EFL_MODULE_STATIC
83# ifdef DLL_EXPORT 79# define EMODAPI __declspec(dllexport)
84# define EAPI __declspec(dllexport)
85# else
86# define EAPI
87# endif
88# else 80# else
89# define EAPI __declspec(dllimport) 81# define EMODAPI
90# endif 82# endif
83# define EMODAPI_WEAK
91#else 84#else
92# ifdef __GNUC__ 85# ifdef __GNUC__
93# if __GNUC__ >= 4 86# if __GNUC__ >= 4
94# define EAPI __attribute__ ((visibility("default"))) 87# define EMODAPI __attribute__ ((visibility("default")))
88# define EMODAPI_WEAK __attribute__ ((weak))
95# else 89# else
96# define EAPI 90# define EMODAPI
91# define EMODAPI_WEAK
97# endif 92# endif
98# else 93# else
99# define EAPI 94# define EMODAPI
95# define EMODAPI_WEAK
100# endif 96# endif
101#endif 97#endif
102 98
@@ -544,38 +540,38 @@ struct _Evas_GL_Image_Data_Map
544}; 540};
545 541
546/* GL_Common function that are used by gl_generic inherited module */ 542/* GL_Common function that are used by gl_generic inherited module */
547EAPI void evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc); 543EMODAPI void evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc);
548EAPI void evas_gl_common_image_ref(Evas_GL_Image *im); 544EMODAPI void evas_gl_common_image_ref(Evas_GL_Image *im);
549EAPI void evas_gl_common_image_unref(Evas_GL_Image *im); 545EMODAPI void evas_gl_common_image_unref(Evas_GL_Image *im);
550EAPI Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace); 546EMODAPI Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace);
551EAPI void evas_gl_common_image_native_disable(Evas_GL_Image *im); 547EMODAPI void evas_gl_common_image_native_disable(Evas_GL_Image *im);
552EAPI void evas_gl_common_image_free(Evas_GL_Image *im); 548EMODAPI void evas_gl_common_image_free(Evas_GL_Image *im);
553EAPI void evas_gl_common_image_native_enable(Evas_GL_Image *im); 549EMODAPI void evas_gl_common_image_native_enable(Evas_GL_Image *im);
554 550
555EAPI int evas_gl_preload_init(void); 551EMODAPI int evas_gl_preload_init(void);
556EAPI int evas_gl_preload_shutdown(void); 552EMODAPI int evas_gl_preload_shutdown(void);
557EAPI Eina_Bool evas_gl_preload_enabled(void); 553EMODAPI Eina_Bool evas_gl_preload_enabled(void);
558 554
559EAPI Evas_Engine_GL_Context *evas_gl_common_context_new(void); 555EMODAPI Evas_Engine_GL_Context *evas_gl_common_context_new(void);
560 556
561EAPI void evas_gl_common_context_flush(Evas_Engine_GL_Context *gc); 557EMODAPI void evas_gl_common_context_flush(Evas_Engine_GL_Context *gc);
562EAPI void evas_gl_common_context_free(Evas_Engine_GL_Context *gc); 558EMODAPI void evas_gl_common_context_free(Evas_Engine_GL_Context *gc);
563EAPI void evas_gl_common_context_use(Evas_Engine_GL_Context *gc); 559EMODAPI void evas_gl_common_context_use(Evas_Engine_GL_Context *gc);
564EAPI void evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc); 560EMODAPI void evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc);
565EAPI void evas_gl_common_context_done(Evas_Engine_GL_Context *gc); 561EMODAPI void evas_gl_common_context_done(Evas_Engine_GL_Context *gc);
566 562
567EAPI void evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot); 563EMODAPI void evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot);
568EAPI int evas_gl_common_buffer_dump(Evas_Engine_GL_Context *gc, const char* dname, const char* fname, int frame, const char* suffix); 564EMODAPI int evas_gl_common_buffer_dump(Evas_Engine_GL_Context *gc, const char* dname, const char* fname, int frame, const char* suffix);
569 565
570EAPI void evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_data); 566EMODAPI void evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_data);
571EAPI void evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine_data); 567EMODAPI void evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine_data);
572EAPI void evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_data); 568EMODAPI void evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_data);
573EAPI void evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn); 569EMODAPI void evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn);
574EAPI Eina_Bool evas_gl_extension_string_check(const char *ext, const char *exts); 570EMODAPI Eina_Bool evas_gl_extension_string_check(const char *ext, const char *exts);
575 571
576EAPI void evas_gl_common_error_set(int error_enum); 572EMODAPI void evas_gl_common_error_set(int error_enum);
577EAPI int evas_gl_common_error_get(void); 573EMODAPI int evas_gl_common_error_get(void);
578EAPI void *evas_gl_common_current_context_get(void); 574EMODAPI void *evas_gl_common_current_context_get(void);
579 575
580typedef int (*Evas_GL_Preload)(void); 576typedef int (*Evas_GL_Preload)(void);
581typedef void (*Evas_GL_Common_Image_Call)(Evas_GL_Image *im); 577typedef void (*Evas_GL_Common_Image_Call)(Evas_GL_Image *im);
@@ -588,7 +584,7 @@ typedef int (*Evas_GL_Common_Buffer_Dump_Call)(Evas_Engine_GL_Context *gc,const
588typedef void (*Evas_Gl_Symbols)(void *(*GetProcAddress)(const char *sym), const char *extsn); 584typedef void (*Evas_Gl_Symbols)(void *(*GetProcAddress)(const char *sym), const char *extsn);
589typedef Eina_Bool (*Evas_Gl_Extension_String_Check)(const char *exts, const char *ext); 585typedef Eina_Bool (*Evas_Gl_Extension_String_Check)(const char *exts, const char *ext);
590 586
591EAPI void __evas_gl_err(int err, const char *file, const char *func, int line, const char *op); 587EMODAPI void __evas_gl_err(int err, const char *file, const char *func, int line, const char *op);
592 588
593int evas_gl_common_version_check(int *minor_version); 589int evas_gl_common_version_check(int *minor_version);
594void evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc, 590void evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc,
@@ -692,7 +688,7 @@ void evas_gl_common_filter_inverse_color_push(Evas_Engine_GL_Contex
692 688
693int evas_gl_common_shader_program_init(Evas_GL_Shared *shared); 689int evas_gl_common_shader_program_init(Evas_GL_Shared *shared);
694void evas_gl_common_shader_program_shutdown(Evas_GL_Shared *shared); 690void evas_gl_common_shader_program_shutdown(Evas_GL_Shared *shared);
695EAPI void evas_gl_common_shaders_flush(Evas_GL_Shared *shared); 691EMODAPI void evas_gl_common_shaders_flush(Evas_GL_Shared *shared);
696 692
697Evas_GL_Program *evas_gl_common_shader_program_get(Evas_Engine_GL_Context *gc, 693Evas_GL_Program *evas_gl_common_shader_program_get(Evas_Engine_GL_Context *gc,
698 Shader_Type type, 694 Shader_Type type,
@@ -788,8 +784,8 @@ extern GLboolean (*glsym_glUnmapBuffer) (GLenum a);
788extern void (*glsym_glRenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); 784extern void (*glsym_glRenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
789 785
790#ifdef GL_GLES 786#ifdef GL_GLES
791EAPI void * evas_gl_common_eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list); 787EMODAPI void * evas_gl_common_eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
792EAPI int evas_gl_common_eglDestroyImage (EGLDisplay dpy, void *im); 788EMODAPI int evas_gl_common_eglDestroyImage (EGLDisplay dpy, void *im);
793extern unsigned int (*eglsym_eglDestroyImage) (void *a, void *b); 789extern unsigned int (*eglsym_eglDestroyImage) (void *a, void *b);
794extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b); 790extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b);
795extern void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d); 791extern void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d);
@@ -984,9 +980,6 @@ _comp_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt
984 980
985#endif 981#endif
986 982
987#undef EAPI
988#define EAPI
989
990extern Eina_Bool _need_context_restore; 983extern Eina_Bool _need_context_restore;
991extern void _context_restore(void); 984extern void _context_restore(void);
992 985
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index af51f9626e..e76b27a012 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -87,7 +87,7 @@ sym_missing(void)
87 * Previously we used strstr(), however there are some extensions 87 * Previously we used strstr(), however there are some extensions
88 * whose names are subsets of others. 88 * whose names are subsets of others.
89 */ 89 */
90EAPI Eina_Bool 90EMODAPI Eina_Bool
91evas_gl_extension_string_check(const char *exts, const char *ext) 91evas_gl_extension_string_check(const char *exts, const char *ext)
92{ 92{
93 const char *ptr; 93 const char *ptr;
@@ -155,7 +155,7 @@ _has_ext(const char *ext, const char **pexts, int *pnum)
155 155
156#ifdef GL_GLES 156#ifdef GL_GLES
157 157
158EAPI void * 158EMODAPI void *
159evas_gl_common_eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list) 159evas_gl_common_eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list)
160{ 160{
161 if (eglsym_eglCreateImageKHR) 161 if (eglsym_eglCreateImageKHR)
@@ -178,7 +178,7 @@ evas_gl_common_eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EG
178 return NULL; 178 return NULL;
179} 179}
180 180
181EAPI int 181EMODAPI int
182evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im) 182evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im)
183{ 183{
184 if (eglsym_eglDestroyImage) 184 if (eglsym_eglDestroyImage)
@@ -189,7 +189,7 @@ evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im)
189#endif 189#endif
190 190
191/* FIXME: return error if a required symbol was not found */ 191/* FIXME: return error if a required symbol was not found */
192EAPI void 192EMODAPI void
193evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn) 193evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
194{ 194{
195 int failed = 0, num = 0; 195 int failed = 0, num = 0;
@@ -442,7 +442,7 @@ static void shader_array_flush(Evas_Engine_GL_Context *gc);
442static Evas_Engine_GL_Context *_evas_gl_common_context = NULL; 442static Evas_Engine_GL_Context *_evas_gl_common_context = NULL;
443static Evas_GL_Shared *shared = NULL; 443static Evas_GL_Shared *shared = NULL;
444 444
445EAPI void 445EMODAPI void
446__evas_gl_err(int err, const char *file, const char *func, int line, const char *op) 446__evas_gl_err(int err, const char *file, const char *func, int line, const char *op)
447{ 447{
448 const char *errmsg; 448 const char *errmsg;
@@ -863,7 +863,7 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc)
863 } 863 }
864} 864}
865 865
866EAPI Evas_Engine_GL_Context * 866EMODAPI Evas_Engine_GL_Context *
867evas_gl_common_context_new(void) 867evas_gl_common_context_new(void)
868{ 868{
869 Evas_Engine_GL_Context *gc; 869 Evas_Engine_GL_Context *gc;
@@ -1419,7 +1419,7 @@ array_alloc(Evas_Engine_GL_Context *gc, int n)
1419#undef RALOC 1419#undef RALOC
1420} 1420}
1421 1421
1422EAPI void 1422EMODAPI void
1423evas_gl_common_context_free(Evas_Engine_GL_Context *gc) 1423evas_gl_common_context_free(Evas_Engine_GL_Context *gc)
1424{ 1424{
1425 int i, j; 1425 int i, j;
@@ -1507,7 +1507,7 @@ evas_gl_common_context_free(Evas_Engine_GL_Context *gc)
1507 } 1507 }
1508} 1508}
1509 1509
1510EAPI void 1510EMODAPI void
1511evas_gl_common_context_use(Evas_Engine_GL_Context *gc) 1511evas_gl_common_context_use(Evas_Engine_GL_Context *gc)
1512{ 1512{
1513 if (_evas_gl_common_context == gc) return; 1513 if (_evas_gl_common_context == gc) return;
@@ -1515,7 +1515,7 @@ evas_gl_common_context_use(Evas_Engine_GL_Context *gc)
1515 if (gc) _evas_gl_common_viewport_set(gc); 1515 if (gc) _evas_gl_common_viewport_set(gc);
1516} 1516}
1517 1517
1518EAPI void 1518EMODAPI void
1519evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc) 1519evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc)
1520{ 1520{
1521 int i; 1521 int i;
@@ -1608,7 +1608,7 @@ evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc)
1608 _evas_gl_common_viewport_set(gc); 1608 _evas_gl_common_viewport_set(gc);
1609} 1609}
1610 1610
1611EAPI void 1611EMODAPI void
1612evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot) 1612evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot)
1613{ 1613{
1614 if ((gc->w == w) && (gc->h == h) && (gc->rot == rot)) return; 1614 if ((gc->w == w) && (gc->h == h) && (gc->rot == rot)) return;
@@ -1659,7 +1659,7 @@ evas_gl_common_tiling_done(Evas_Engine_GL_Context *gc EINA_UNUSED)
1659} 1659}
1660 1660
1661 1661
1662EAPI void 1662EMODAPI void
1663evas_gl_common_context_done(Evas_Engine_GL_Context *gc) 1663evas_gl_common_context_done(Evas_Engine_GL_Context *gc)
1664{ 1664{
1665 if (gc->master_clip.used) 1665 if (gc->master_clip.used)
@@ -3909,7 +3909,7 @@ evas_gl_common_filter_inverse_color_push(Evas_Engine_GL_Context *gc,
3909} 3909}
3910// ---------------------------------------------------------------------------- 3910// ----------------------------------------------------------------------------
3911 3911
3912EAPI void 3912EMODAPI void
3913evas_gl_common_context_flush(Evas_Engine_GL_Context *gc) 3913evas_gl_common_context_flush(Evas_Engine_GL_Context *gc)
3914{ 3914{
3915 shader_array_flush(gc); 3915 shader_array_flush(gc);
@@ -4712,7 +4712,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
4712 gc->havestuff = EINA_FALSE; 4712 gc->havestuff = EINA_FALSE;
4713} 4713}
4714 4714
4715EAPI int 4715EMODAPI int
4716evas_gl_common_buffer_dump(Evas_Engine_GL_Context *gc, const char* dname, const char* buf_name, int frame, const char *suffix) 4716evas_gl_common_buffer_dump(Evas_Engine_GL_Context *gc, const char* dname, const char* buf_name, int frame, const char *suffix)
4717{ 4717{
4718 RGBA_Image *im = NULL; 4718 RGBA_Image *im = NULL;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 786c54c825..5a10e37842 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -1721,7 +1721,7 @@ _evgl_tls_resource_destroy(void *eng_data)
1721 evgl_engine->resource_key = 0; 1721 evgl_engine->resource_key = 0;
1722} 1722}
1723 1723
1724EAPI void * /* EVGL_Context */ 1724EMODAPI void * /* EVGL_Context */
1725evas_gl_common_current_context_get(void) 1725evas_gl_common_current_context_get(void)
1726{ 1726{
1727 EVGL_Resource *rsc; 1727 EVGL_Resource *rsc;
@@ -1735,7 +1735,7 @@ evas_gl_common_current_context_get(void)
1735 return rsc->current_ctx; 1735 return rsc->current_ctx;
1736} 1736}
1737 1737
1738EAPI void * 1738EMODAPI void *
1739evgl_current_native_context_get(EVGL_Context *ctx) 1739evgl_current_native_context_get(EVGL_Context *ctx)
1740{ 1740{
1741 EVGLNative_Context context; 1741 EVGLNative_Context context;
@@ -1787,7 +1787,7 @@ _evgl_direct_enabled(void)
1787 return _evgl_direct_renderable(rsc, sfc); 1787 return _evgl_direct_renderable(rsc, sfc);
1788} 1788}
1789 1789
1790EAPI void 1790EMODAPI void
1791evas_gl_common_error_set(int error_enum) 1791evas_gl_common_error_set(int error_enum)
1792{ 1792{
1793 EVGL_Resource *rsc; 1793 EVGL_Resource *rsc;
@@ -1801,7 +1801,7 @@ evas_gl_common_error_set(int error_enum)
1801 rsc->error_state = error_enum; 1801 rsc->error_state = error_enum;
1802} 1802}
1803 1803
1804EAPI int 1804EMODAPI int
1805evas_gl_common_error_get(void) 1805evas_gl_common_error_get(void)
1806{ 1806{
1807 EVGL_Resource *rsc; 1807 EVGL_Resource *rsc;
@@ -3266,7 +3266,7 @@ evgl_direct_partial_render_end()
3266 } 3266 }
3267} 3267}
3268 3268
3269EAPI void 3269EMODAPI void
3270evas_gl_common_context_restore_set(Eina_Bool enable) 3270evas_gl_common_context_restore_set(Eina_Bool enable)
3271{ 3271{
3272 _need_context_restore = enable; 3272 _need_context_restore = enable;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.h b/src/modules/evas/engines/gl_common/evas_gl_core.h
index 7aead8dd96..8eec4baad2 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.h
@@ -3,29 +3,25 @@
3#define EVAS_GL_NO_GL_H_CHECK 1 3#define EVAS_GL_NO_GL_H_CHECK 1
4#include "Evas_GL.h" 4#include "Evas_GL.h"
5 5
6#ifdef EAPI 6#ifdef EMODAPI
7# undef EAPI 7# undef EMODAPI
8#endif 8#endif
9 9
10#ifdef _WIN32 10#ifdef _WIN32
11# ifdef EFL_BUILD 11# ifndef EFL_MODULE_STATIC
12# ifdef DLL_EXPORT 12# define EMODAPI __declspec(dllexport)
13# define EAPI __declspec(dllexport)
14# else
15# define EAPI
16# endif
17# else 13# else
18# define EAPI __declspec(dllimport) 14# define EMODAPI
19# endif 15# endif
20#else 16#else
21# ifdef __GNUC__ 17# ifdef __GNUC__
22# if __GNUC__ >= 4 18# if __GNUC__ >= 4
23# define EAPI __attribute__ ((visibility("default"))) 19# define EMODAPI __attribute__ ((visibility("default")))
24# else 20# else
25# define EAPI 21# define EMODAPI
26# endif 22# endif
27# else 23# else
28# define EAPI 24# define EMODAPI
29# endif 25# endif
30#endif 26#endif
31 27
@@ -43,11 +39,11 @@ typedef struct _EVGL_Cap EVGL_Cap;
43typedef struct _EVGL_Surface_Cap EVGL_Surface_Cap; 39typedef struct _EVGL_Surface_Cap EVGL_Surface_Cap;
44typedef struct _EVGL_Surface_Format EVGL_Surface_Format; 40typedef struct _EVGL_Surface_Format EVGL_Surface_Format;
45 41
46EAPI void evgl_engine_shutdown(void *eng_data); 42EMODAPI void evgl_engine_shutdown(void *eng_data);
47EAPI void *evgl_native_surface_buffer_get(EVGL_Surface *sfc, Eina_Bool *is_egl_image); 43EMODAPI void *evgl_native_surface_buffer_get(EVGL_Surface *sfc, Eina_Bool *is_egl_image);
48EAPI int evgl_native_surface_yinvert_get(EVGL_Surface *sfc); 44EMODAPI int evgl_native_surface_yinvert_get(EVGL_Surface *sfc);
49EAPI void *evgl_current_native_context_get(EVGL_Context *ctx); 45EMODAPI void *evgl_current_native_context_get(EVGL_Context *ctx);
50EAPI void evas_gl_common_context_restore_set(Eina_Bool); 46EMODAPI void evas_gl_common_context_restore_set(Eina_Bool);
51 47
52typedef void (*EVGL_Engine_Call)(void *eng_data); 48typedef void (*EVGL_Engine_Call)(void *eng_data);
53typedef void *(*EVGL_Native_Surface_Call)(void *sfc, Eina_Bool *is_egl_image); 49typedef void *(*EVGL_Native_Surface_Call)(void *sfc, Eina_Bool *is_egl_image);
@@ -89,7 +85,4 @@ void evgl_direct_partial_info_clear(void);
89void evgl_direct_partial_render_start(void); 85void evgl_direct_partial_render_start(void);
90void evgl_direct_partial_render_end(void); 86void evgl_direct_partial_render_end(void);
91 87
92#undef EAPI
93#define EAPI
94
95#endif //_EVAS_GL_CORE_H 88#endif //_EVAS_GL_CORE_H
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 3a75852ed0..78a3fe09b1 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -8,7 +8,7 @@ evas_gl_common_image_alloc_ensure(Evas_GL_Image *im)
8 im->w, im->h); 8 im->w, im->h);
9} 9}
10 10
11EAPI void 11EMODAPI void
12evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc) 12evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc)
13{ 13{
14 Eina_List *l; 14 Eina_List *l;
@@ -89,7 +89,7 @@ _evas_gl_image_cache_add(Evas_GL_Image *im)
89 return EINA_FALSE; 89 return EINA_FALSE;
90} 90}
91 91
92EAPI void 92EMODAPI void
93evas_gl_common_image_ref(Evas_GL_Image *im) 93evas_gl_common_image_ref(Evas_GL_Image *im)
94{ 94{
95 if (im->references == 0) 95 if (im->references == 0)
@@ -99,7 +99,7 @@ evas_gl_common_image_ref(Evas_GL_Image *im)
99 im->references++; 99 im->references++;
100} 100}
101 101
102EAPI void 102EMODAPI void
103evas_gl_common_image_unref(Evas_GL_Image *im) 103evas_gl_common_image_unref(Evas_GL_Image *im)
104{ 104{
105 im->references--; 105 im->references--;
@@ -330,7 +330,7 @@ evas_gl_common_image_mmap(Evas_Engine_GL_Context *gc, Eina_File *f, const char *
330 return evas_gl_common_image_new_from_rgbaimage(gc, im_im, lo, error); 330 return evas_gl_common_image_new_from_rgbaimage(gc, im_im, lo, error);
331} 331}
332 332
333EAPI Evas_GL_Image * 333EMODAPI Evas_GL_Image *
334evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace) 334evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace)
335{ 335{
336 Evas_GL_Image *im; 336 Evas_GL_Image *im;
@@ -539,7 +539,7 @@ evas_gl_common_image_alpha_set(Evas_GL_Image *im, int alpha)
539 return im; 539 return im;
540} 540}
541 541
542EAPI void 542EMODAPI void
543evas_gl_common_image_native_enable(Evas_GL_Image *im) 543evas_gl_common_image_native_enable(Evas_GL_Image *im)
544{ 544{
545 if (im->cs.data) 545 if (im->cs.data)
@@ -571,7 +571,7 @@ evas_gl_common_image_native_enable(Evas_GL_Image *im)
571 im->tex_only = 1; 571 im->tex_only = 1;
572} 572}
573 573
574EAPI void 574EMODAPI void
575evas_gl_common_image_native_disable(Evas_GL_Image *im) 575evas_gl_common_image_native_disable(Evas_GL_Image *im)
576{ 576{
577 if (im->im) 577 if (im->im)
@@ -691,7 +691,7 @@ evas_gl_common_image_cache_flush(Evas_Engine_GL_Context *gc)
691 _evas_gl_image_cache_trim(gc); 691 _evas_gl_image_cache_trim(gc);
692} 692}
693 693
694EAPI void 694EMODAPI void
695evas_gl_common_image_free(Evas_GL_Image *im) 695evas_gl_common_image_free(Evas_GL_Image *im)
696{ 696{
697 if (!im) return; 697 if (!im) return;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index df5a4be924..6b51e338c0 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -231,7 +231,7 @@ _evas_gl_preload_tile_async(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
231 231
232 232
233// Put the async preloader on standby 233// Put the async preloader on standby
234EAPI void 234EMODAPI void
235evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_data) 235evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_data)
236{ 236{
237 if (!async_loader_init) return ; 237 if (!async_loader_init) return ;
@@ -251,7 +251,7 @@ evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_d
251} 251}
252 252
253// Let the async preloader run ! 253// Let the async preloader run !
254EAPI void 254EMODAPI void
255evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine_data) 255evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine_data)
256{ 256{
257 if (!async_loader_init) return ; 257 if (!async_loader_init) return ;
@@ -272,7 +272,7 @@ evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine
272} 272}
273 273
274// add a way to destroy surface and temporarily stop the rendering of the image 274// add a way to destroy surface and temporarily stop the rendering of the image
275EAPI void 275EMODAPI void
276evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_data) 276evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_data)
277{ 277{
278 if (engine_data != async_engine_data) return ; 278 if (engine_data != async_engine_data) return ;
@@ -324,7 +324,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo *target)
324 } 324 }
325} 325}
326 326
327EAPI int 327EMODAPI int
328evas_gl_preload_init(void) 328evas_gl_preload_init(void)
329{ 329{
330 const char *s = getenv("EVAS_GL_PRELOAD"); 330 const char *s = getenv("EVAS_GL_PRELOAD");
@@ -342,7 +342,7 @@ evas_gl_preload_init(void)
342 return async_loader_init; 342 return async_loader_init;
343} 343}
344 344
345EAPI int 345EMODAPI int
346evas_gl_preload_shutdown(void) 346evas_gl_preload_shutdown(void)
347{ 347{
348 const char *s = getenv("EVAS_GL_PRELOAD"); 348 const char *s = getenv("EVAS_GL_PRELOAD");
@@ -360,7 +360,7 @@ evas_gl_preload_shutdown(void)
360 return async_loader_init; 360 return async_loader_init;
361} 361}
362 362
363EAPI Eina_Bool 363EMODAPI Eina_Bool
364evas_gl_preload_enabled(void) 364evas_gl_preload_enabled(void)
365{ 365{
366 return (async_loader_init >= 1); 366 return (async_loader_init >= 1);
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index b3802f2c70..5d84504817 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -714,7 +714,7 @@ evas_gl_common_shader_program_init(Evas_GL_Shared *shared)
714 return 1; 714 return 1;
715} 715}
716 716
717EAPI void 717EMODAPI void
718evas_gl_common_shaders_flush(Evas_GL_Shared *shared) 718evas_gl_common_shaders_flush(Evas_GL_Shared *shared)
719{ 719{
720 720
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl.h b/src/modules/evas/engines/gl_generic/evas_ector_gl.h
index 6e4c46e5fc..f73ea675d3 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl.h
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl.h
@@ -1,27 +1,17 @@
1#ifndef EVAS_ECTOR_GL_H 1#ifndef EVAS_ECTOR_GL_H
2#define EVAS_ECTOR_GL_H 2#define EVAS_ECTOR_GL_H
3 3
4#undef EAPI
5
6#ifdef _WIN32 4#ifdef _WIN32
7# ifdef EFL_BUILD 5# define EMODAPI __declspec(dllexport)
8# ifdef DLL_EXPORT
9# define EAPI __declspec(dllexport)
10# else
11# define EAPI
12# endif
13# else
14# define EAPI __declspec(dllimport)
15# endif
16#else 6#else
17# ifdef __GNUC__ 7# ifdef __GNUC__
18# if __GNUC__ >= 4 8# if __GNUC__ >= 4
19# define EAPI __attribute__ ((visibility("default"))) 9# define EMODAPI __attribute__ ((visibility("default")))
20# else 10# else
21# define EAPI 11# define EMODAPI
22# endif 12# endif
23# else 13# else
24# define EAPI 14# define EMODAPI
25# endif 15# endif
26#endif 16#endif
27 17
@@ -29,8 +19,5 @@
29#include "evas_ector_gl_buffer.eo.h" 19#include "evas_ector_gl_buffer.eo.h"
30#include "evas_ector_gl_image_buffer.eo.h" 20#include "evas_ector_gl_image_buffer.eo.h"
31 21
32#undef EAPI
33#define EAPI
34
35#endif /* ! EVAS_ECTOR_GL_H */ 22#endif /* ! EVAS_ECTOR_GL_H */
36 23
diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build
index 3a00883b8a..0464ea43a8 100644
--- a/src/modules/evas/engines/gl_generic/meson.build
+++ b/src/modules/evas/engines/gl_generic/meson.build
@@ -59,6 +59,7 @@ foreach eo_file : pub_eo_files
59 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 59 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
60 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 60 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
61 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 61 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
62 '-e', 'EMODAPI',
62 '-gchd', '@INPUT@']) 63 '-gchd', '@INPUT@'])
63endforeach 64endforeach
64 65
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software.h b/src/modules/evas/engines/software_generic/evas_ector_software.h
index f2625371a3..e7a962670a 100644
--- a/src/modules/evas/engines/software_generic/evas_ector_software.h
+++ b/src/modules/evas/engines/software_generic/evas_ector_software.h
@@ -1,37 +1,29 @@
1#ifndef EVAS_ECTOR_SOFTWARE_H 1#ifndef EVAS_ECTOR_SOFTWARE_H
2#define EVAS_ECTOR_SOFTWARE_H 2#define EVAS_ECTOR_SOFTWARE_H
3 3
4#ifdef EAPI
5# undef EAPI
6#endif
7
8#ifdef _WIN32 4#ifdef _WIN32
9# ifdef EFL_BUILD 5# ifndef EFL_MODULE_STATIC
10# ifdef DLL_EXPORT 6# define EMODAPI __declspec(dllexport)
11# define EAPI __declspec(dllexport)
12# else
13# define EAPI
14# endif
15# else 7# else
16# define EAPI __declspec(dllimport) 8# define EMODAPI
17# endif 9# endif
18#else 10#else
19# ifdef __GNUC__ 11# ifdef __GNUC__
20# if __GNUC__ >= 4 12# if __GNUC__ >= 4
21# define EAPI __attribute__ ((visibility("default"))) 13# define EMODAPI __attribute__ ((visibility("default")))
14# define EMODAPI_WEAK __attribute__ ((weak))
22# else 15# else
23# define EAPI 16# define EMODAPI
17# define EMODAPI_WEAK
24# endif 18# endif
25# else 19# else
26# define EAPI 20# define EMODAPI
21# define EMODAPI_WEAK
27# endif 22# endif
28#endif 23#endif
29 24
30#include "evas_ector_buffer.eo.h" 25#include "evas_ector_buffer.eo.h"
31#include "evas_ector_software_buffer.eo.h" 26#include "evas_ector_software_buffer.eo.h"
32 27
33#undef EAPI
34#define EAPI
35
36#endif /* ! EVAS_ECTOR_SOFTWARE_H */ 28#endif /* ! EVAS_ECTOR_SOFTWARE_H */
37 29
diff --git a/src/modules/evas/engines/software_generic/evas_native_common.h b/src/modules/evas/engines/software_generic/evas_native_common.h
index 4121746fd7..d238a4b358 100644
--- a/src/modules/evas/engines/software_generic/evas_native_common.h
+++ b/src/modules/evas/engines/software_generic/evas_native_common.h
@@ -1,29 +1,24 @@
1#ifndef _EVAS_NATIVE_COMMON_H 1#ifndef _EVAS_NATIVE_COMMON_H
2#define _EVAS_NATIVE_COMMON_H 2#define _EVAS_NATIVE_COMMON_H
3 3
4#ifdef EAPI
5# undef EAPI
6#endif
7
8#ifdef _WIN32 4#ifdef _WIN32
9# ifdef EFL_BUILD 5# ifndef EFL_MODULE_STATIC
10# ifdef DLL_EXPORT 6# define EMODAPI __declspec(dllexport)
11# define EAPI __declspec(dllexport)
12# else
13# define EAPI
14# endif
15# else 7# else
16# define EAPI __declspec(dllimport) 8# define EMODAPI
17# endif 9# endif
18#else 10#else
19# ifdef __GNUC__ 11# ifdef __GNUC__
20# if __GNUC__ >= 4 12# if __GNUC__ >= 4
21# define EAPI __attribute__ ((visibility("default"))) 13# define EMODAPI __attribute__ ((visibility("default")))
14# define EMODAPI_WEAK __attribute__ ((weak))
22# else 15# else
23# define EAPI 16# define EMODAPI
17# define EMODAPI_WEAK
24# endif 18# endif
25# else 19# else
26# define EAPI 20# define EMODAPI
21# define EMODAPI_WEAK
27# endif 22# endif
28#endif 23#endif
29 24
@@ -109,10 +104,10 @@ struct _Native
109 } ns_data; /**< Choose one union data according to your surface in Evas Engine. */ 104 } ns_data; /**< Choose one union data according to your surface in Evas Engine. */
110}; 105};
111 106
112EAPI void *_evas_native_tbm_surface_image_set(void *data, void *image, void *native); 107EMODAPI void *_evas_native_tbm_surface_image_set(void *data, void *image, void *native);
113EAPI int _evas_native_tbm_surface_stride_get(void *data, void *native); 108EMODAPI int _evas_native_tbm_surface_stride_get(void *data, void *native);
114EAPI int _evas_native_tbm_init(void); 109EMODAPI int _evas_native_tbm_init(void);
115EAPI void _evas_native_tbm_shutdown(void); 110EMODAPI void _evas_native_tbm_shutdown(void);
116 111
117void *_evas_native_dmabuf_surface_image_set(void *image, void *native); 112void *_evas_native_dmabuf_surface_image_set(void *image, void *native);
118 113
diff --git a/src/modules/evas/engines/software_generic/evas_native_tbm.c b/src/modules/evas/engines/software_generic/evas_native_tbm.c
index 2827e80d02..cf6ad4b4b6 100644
--- a/src/modules/evas/engines/software_generic/evas_native_tbm.c
+++ b/src/modules/evas/engines/software_generic/evas_native_tbm.c
@@ -70,7 +70,7 @@ static int (*sym_tbm_surface_map) (tbm_surface_h surface, int opt, tbm_surface_i
70static int (*sym_tbm_surface_unmap) (tbm_surface_h surface) = NULL; 70static int (*sym_tbm_surface_unmap) (tbm_surface_h surface) = NULL;
71static int (*sym_tbm_surface_get_info) (tbm_surface_h surface, tbm_surface_info_s *info) = NULL; 71static int (*sym_tbm_surface_get_info) (tbm_surface_h surface, tbm_surface_info_s *info) = NULL;
72 72
73EAPI int 73EMODAPI int
74_evas_native_tbm_init(void) 74_evas_native_tbm_init(void)
75{ 75{
76 if (tbm_lib) 76 if (tbm_lib)
@@ -118,7 +118,7 @@ _evas_native_tbm_init(void)
118 return tbm_ref; 118 return tbm_ref;
119} 119}
120 120
121EAPI void 121EMODAPI void
122_evas_native_tbm_shutdown(void) 122_evas_native_tbm_shutdown(void)
123{ 123{
124 if (tbm_ref > 0) 124 if (tbm_ref > 0)
@@ -262,7 +262,7 @@ _native_free_cb(void *image)
262 _evas_native_tbm_shutdown(); 262 _evas_native_tbm_shutdown();
263} 263}
264 264
265EAPI int 265EMODAPI int
266_evas_native_tbm_surface_stride_get(void *data EINA_UNUSED, void *native) 266_evas_native_tbm_surface_stride_get(void *data EINA_UNUSED, void *native)
267{ 267{
268 Evas_Native_Surface *ns = native; 268 Evas_Native_Surface *ns = native;
@@ -285,7 +285,7 @@ _evas_native_tbm_surface_stride_get(void *data EINA_UNUSED, void *native)
285 return stride; 285 return stride;
286 } 286 }
287 287
288EAPI void * 288EMODAPI void *
289_evas_native_tbm_surface_image_set(void *data EINA_UNUSED, void *image, void *native) 289_evas_native_tbm_surface_image_set(void *data EINA_UNUSED, void *image, void *native)
290{ 290{
291 Evas_Native_Surface *ns = native; 291 Evas_Native_Surface *ns = native;
diff --git a/src/modules/evas/image_loaders/eet/evas_image_load_eet.c b/src/modules/evas/image_loaders/eet/evas_image_load_eet.c
index 4760ecc94e..9b4dfe4cdc 100644
--- a/src/modules/evas/image_loaders/eet/evas_image_load_eet.c
+++ b/src/modules/evas/image_loaders/eet/evas_image_load_eet.c
@@ -1,5 +1,5 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" /* so that EAPI in Eet.h is correctly defined */ 2# include "config.h" /* so that EMODAPI in Eet.h is correctly defined */
3#endif 3#endif
4 4
5#include <Eet.h> 5#include <Eet.h>
diff --git a/src/modules/evas/image_savers/eet/evas_image_save_eet.c b/src/modules/evas/image_savers/eet/evas_image_save_eet.c
index d3c4eba155..c4e97840a1 100644
--- a/src/modules/evas/image_savers/eet/evas_image_save_eet.c
+++ b/src/modules/evas/image_savers/eet/evas_image_save_eet.c
@@ -1,5 +1,5 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" /* so that EAPI in Eet.h is correctly defined */ 2# include "config.h" /* so that EMODAPI in Eet.h is correctly defined */
3#endif 3#endif
4 4
5#include <Eet.h> 5#include <Eet.h>