cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e5d84da864214b9f772808040f22e1614889a25f
commit e5d84da864214b9f772808040f22e1614889a25f Author: Cedric BAIL <[email protected]> Date: Tue Nov 14 13:50:13 2017 -0800 ecore: move EAPI_MAIN from elementary to ecore. --- src/lib/ecore/efl_general.h | 17 +++++++++++++++++ src/lib/elementary/Elementary.h | 4 ---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h index c91f61fce2..3a79e46d33 100644 --- a/src/lib/ecore/efl_general.h +++ b/src/lib/ecore/efl_general.h @@ -13,6 +13,23 @@ #undef __EFL_NET #undef EFL_MAIN #undef EFL_MAIN_EX +#undef EAPI_MAIN + +#ifdef _WIN32 +// There is no support for quicklaunch on windows, so no needs +// to export the efl_main symbol +# define EAPI_MAIN +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI_MAIN __attribute__ ((visibility("default"))) +# else +# define EAPI_MAIN +# endif +# else +# define EAPI_MAIN +# endif +#endif /* ! _WIN32 */ #ifdef EFL_VERSION_MICRO # define _EFL_VERSION_MICRO EFL_VERSION_MICRO diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h index 3913084bf3..bf41fdea47 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h @@ -85,7 +85,6 @@ #endif #ifdef _WIN32 -# define EAPI_MAIN # ifdef ELEMENTARY_BUILD # ifdef DLL_EXPORT # define EAPI __declspec(dllexport) @@ -99,14 +98,11 @@ # ifdef __GNUC__ # if __GNUC__ >= 4 # define EAPI __attribute__ ((visibility("default"))) -# define EAPI_MAIN __attribute__ ((visibility("default"))) # else # define EAPI -# define EAPI_MAIN # endif # else # define EAPI -# define EAPI_MAIN # endif #endif /* ! _WIN32 */ --
