summaryrefslogtreecommitdiff
path: root/src/lib
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 /src/lib
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
3 files changed, 22 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