summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-12-20 18:54:14 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-12-20 19:07:01 +0900
commit9c88bc4933560c74fd97a1cccc29fe6542f71755 (patch)
tree835751c6498559d894c38d54cf41f893017ca8bf
parent5162d66c51ffd328473cd72c1372cb27a955f590 (diff)
elm build for osx - try another dotting of i's and crossing of t's
try this and fix T6448 ...
Diffstat (limited to '')
-rw-r--r--src/lib/eina/eina_types.h3
-rw-r--r--src/lib/elementary/Elementary.h12
-rw-r--r--src/lib/elementary/elm_module_helper.h9
-rw-r--r--src/modules/elementary/access_output/mod.c1
-rw-r--r--src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c1
-rw-r--r--src/modules/elementary/prefs/prefs_iface.c1
-rw-r--r--src/modules/elementary/test_entry/mod.c1
-rw-r--r--src/modules/elementary/test_map/mod.c1
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c1
9 files changed, 28 insertions, 2 deletions
diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h
index 2370596e73..94e6ebc6f3 100644
--- a/src/lib/eina/eina_types.h
+++ b/src/lib/eina/eina_types.h
@@ -61,7 +61,8 @@
61 * @brief Used to export functions (by changing visibility). 61 * @brief Used to export functions (by changing visibility).
62 */ 62 */
63# define EAPI 63# define EAPI
64# endif 64# define EAPI_WEAK
65# endif
65#endif 66#endif
66 67
67/* Weak symbols part of EFL API - Note: not weak on all platforms */ 68/* Weak symbols part of EFL API - Note: not weak on all platforms */
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index e6197acef7..57192ae4b1 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -83,6 +83,9 @@
83#ifdef EAPI 83#ifdef EAPI
84# undef EAPI 84# undef EAPI
85#endif 85#endif
86#ifdef EWAPI
87# undef EWAPI
88#endif
86 89
87#ifdef _WIN32 90#ifdef _WIN32
88# ifdef ELEMENTARY_BUILD 91# ifdef ELEMENTARY_BUILD
@@ -94,18 +97,25 @@
94# else 97# else
95# define EAPI __declspec(dllimport) 98# define EAPI __declspec(dllimport)
96# endif /* ! EFL_EVAS_BUILD */ 99# endif /* ! EFL_EVAS_BUILD */
100# define EAPI_WEAK
97#else 101#else
98# ifdef __GNUC__ 102# ifdef __GNUC__
99# if __GNUC__ >= 4 103# if __GNUC__ >= 4
100# define EAPI __attribute__ ((visibility("default"))) 104# define EAPI __attribute__ ((visibility("default")))
105# define EAPI_WEAK __attribute__ ((weak))
101# else 106# else
102# define EAPI 107# define EAPI
103# endif 108# define EAPI_WEAK
109# endif
104# else 110# else
105# define EAPI 111# define EAPI
112# define EAPI_WEAK
106# endif 113# endif
107#endif /* ! _WIN32 */ 114#endif /* ! _WIN32 */
108 115
116#define EWAPI EAPI EAPI_WEAK
117
118
109/* allow usage from c++ */ 119/* allow usage from c++ */
110#ifdef __cplusplus 120#ifdef __cplusplus
111extern "C" 121extern "C"
diff --git a/src/lib/elementary/elm_module_helper.h b/src/lib/elementary/elm_module_helper.h
index f4e7d22a99..6d9840af4b 100644
--- a/src/lib/elementary/elm_module_helper.h
+++ b/src/lib/elementary/elm_module_helper.h
@@ -8,6 +8,9 @@
8#ifdef EAPI 8#ifdef EAPI
9# undef EAPI 9# undef EAPI
10#endif 10#endif
11#ifdef EWAPI
12# undef EWAPI
13#endif
11 14
12#ifdef _WIN32 15#ifdef _WIN32
13# ifdef ELEMENTARY_BUILD 16# ifdef ELEMENTARY_BUILD
@@ -19,16 +22,22 @@
19# else 22# else
20# define EAPI __declspec(dllimport) 23# define EAPI __declspec(dllimport)
21# endif /* ! EFL_EVAS_BUILD */ 24# endif /* ! EFL_EVAS_BUILD */
25# define EAPI_WEAK
22#else 26#else
23# ifdef __GNUC__ 27# ifdef __GNUC__
24# if __GNUC__ >= 4 28# if __GNUC__ >= 4
25# define EAPI __attribute__ ((visibility("default"))) 29# define EAPI __attribute__ ((visibility("default")))
30# define EAPI_WEAK __attribute__ ((weak))
26# else 31# else
27# define EAPI 32# define EAPI
33# define EAPI_WEAK
28# endif 34# endif
29# else 35# else
30# define EAPI 36# define EAPI
37# define EAPI_WEAK
31# endif 38# endif
32#endif /* ! _WIN32 */ 39#endif /* ! _WIN32 */
33 40
41#define EWAPI EAPI EAPI_WEAK
42
34#endif 43#endif
diff --git a/src/modules/elementary/access_output/mod.c b/src/modules/elementary/access_output/mod.c
index 203f584a3e..f1c9dafd46 100644
--- a/src/modules/elementary/access_output/mod.c
+++ b/src/modules/elementary/access_output/mod.c
@@ -5,6 +5,7 @@
5#include "Elementary.h" 5#include "Elementary.h"
6 6
7#define ELEMENTARY_BUILD 7#define ELEMENTARY_BUILD
8#undef ELM_MODULE_HELPER_H
8#include "elm_module_helper.h" 9#include "elm_module_helper.h"
9 10
10/* to enable this module 11/* to enable this module
diff --git a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
index 4626c94be1..d40e82be0b 100644
--- a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
+++ b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
@@ -10,6 +10,7 @@
10#include "elm_ctxpopup.eo.h" 10#include "elm_ctxpopup.eo.h"
11 11
12#define ELEMENTARY_BUILD 12#define ELEMENTARY_BUILD
13#undef ELM_MODULE_HELPER_H
13#include "elm_module_helper.h" 14#include "elm_module_helper.h"
14 15
15#define CLOCK_FIELD_COUNT 8 16#define CLOCK_FIELD_COUNT 8
diff --git a/src/modules/elementary/prefs/prefs_iface.c b/src/modules/elementary/prefs/prefs_iface.c
index 0c46a25261..4943cd4566 100644
--- a/src/modules/elementary/prefs/prefs_iface.c
+++ b/src/modules/elementary/prefs/prefs_iface.c
@@ -5,6 +5,7 @@
5#include "Elementary.h" 5#include "Elementary.h"
6 6
7#define ELEMENTARY_BUILD 7#define ELEMENTARY_BUILD
8#undef ELM_MODULE_HELPER_H
8#include "private.h" 9#include "private.h"
9 10
10/* including declaration of each prefs item implementation iface struct */ 11/* including declaration of each prefs item implementation iface struct */
diff --git a/src/modules/elementary/test_entry/mod.c b/src/modules/elementary/test_entry/mod.c
index 8fd4181a6d..0d16e22226 100644
--- a/src/modules/elementary/test_entry/mod.c
+++ b/src/modules/elementary/test_entry/mod.c
@@ -5,6 +5,7 @@
5#include "Elementary.h" 5#include "Elementary.h"
6 6
7#define ELEMENTARY_BUILD 7#define ELEMENTARY_BUILD
8#undef ELM_MODULE_HELPER_H
8#include "elm_module_helper.h" 9#include "elm_module_helper.h"
9 10
10// module api funcs needed 11// module api funcs needed
diff --git a/src/modules/elementary/test_map/mod.c b/src/modules/elementary/test_map/mod.c
index 457f24754e..4d7db03284 100644
--- a/src/modules/elementary/test_map/mod.c
+++ b/src/modules/elementary/test_map/mod.c
@@ -7,6 +7,7 @@
7#include "elm_widget_map.h" 7#include "elm_widget_map.h"
8 8
9#define ELEMENTARY_BUILD 9#define ELEMENTARY_BUILD
10#undef ELM_MODULE_HELPER_H
10#include "elm_module_helper.h" 11#include "elm_module_helper.h"
11 12
12EAPI Eina_Stringshare * 13EAPI Eina_Stringshare *
diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index bd3024d273..21ebaa9dcc 100644
--- a/src/modules/elementary/web/none/elm_web_none.c
+++ b/src/modules/elementary/web/none/elm_web_none.c
@@ -10,6 +10,7 @@
10#include "elm_widget_web.h" 10#include "elm_widget_web.h"
11 11
12#define ELEMENTARY_BUILD 12#define ELEMENTARY_BUILD
13#undef ELM_MODULE_HELPER_H
13#include "elm_module_helper.h" 14#include "elm_module_helper.h"
14#include "elm_web_none.eo.h" 15#include "elm_web_none.eo.h"
15 16