jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=67ab4e3b4dbc433464e7423ab092bf61aaa16083
commit 67ab4e3b4dbc433464e7423ab092bf61aaa16083 Author: Jean-Philippe Andre <[email protected]> Date: Mon Aug 1 16:06:44 2016 +0900 eina: Move EWAPI and EAPI_WEAK to Eina.h from Eo.h So it may be used outside EO (eina error is what I have in mind). I believe it doesn't need to be redefined in all EFL libs, especially since it's not used on Windows yet. --- src/lib/eina/eina_types.h | 6 ++++++ src/lib/eo/Eo.h | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h index b7bce49..4e8e4e7 100644 --- a/src/lib/eina/eina_types.h +++ b/src/lib/eina/eina_types.h @@ -45,12 +45,15 @@ # else # define EAPI __declspec(dllimport) # endif /* ! EFL_EINA_BUILD */ +# define EAPI_WEAK #else # ifdef __GNUC__ # if __GNUC__ >= 4 # define EAPI __attribute__ ((visibility("default"))) +# define EAPI_WEAK __attribute__ ((weak)) # else # define EAPI +# define EAPI_WEAK # endif # else /** @@ -61,6 +64,9 @@ # endif #endif +/* Weak symbols part of EFL API - Note: not weak on all platforms */ +#define EWAPI EAPI EAPI_WEAK + #ifdef _WIN32 # ifdef DLL_EXPORT # define EXPORTAPI __declspec(dllexport) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index fe3cbee..b03b9ed 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -12,7 +12,6 @@ /* When used, it indicates that the function is an Eo API. */ #define EOAPI EAPI EAPI_WEAK -#define EWAPI EAPI EAPI_WEAK #ifdef _WIN32 # ifdef EFL_EO_BUILD @@ -24,19 +23,15 @@ # else # define EAPI __declspec(dllimport) # endif /* ! EFL_EO_BUILD */ -# define EAPI_WEAK #else # ifdef __GNUC__ # if __GNUC__ >= 4 # define EAPI __attribute__ ((visibility("default"))) -# define EAPI_WEAK __attribute__ ((weak)) # else # define EAPI -# define EAPI_WEAK # endif # else # define EAPI -# define EAPI_WEAK # endif #endif /* ! _WIN32 */ --
