enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

ecore: move EAPI_MAIN from elementary to ecore.

This commit is contained in:
Cedric BAIL 2017-11-14 13:50:13 -08:00
parent 95b0d7ca68
commit e5d84da864
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/ecore/efl_general.h
View File

@ -13,6 +13,23 @@
#undef __EFL_NET #undef __EFL_NET
#undef EFL_MAIN #undef EFL_MAIN
#undef EFL_MAIN_EX #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 #ifdef EFL_VERSION_MICRO
# define _EFL_VERSION_MICRO EFL_VERSION_MICRO # define _EFL_VERSION_MICRO EFL_VERSION_MICRO

4
src/lib/elementary/Elementary.h
View File

@ -85,7 +85,6 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# define EAPI_MAIN
# ifdef ELEMENTARY_BUILD # ifdef ELEMENTARY_BUILD
# ifdef DLL_EXPORT # ifdef DLL_EXPORT
# define EAPI __declspec(dllexport) # define EAPI __declspec(dllexport)
@ -99,14 +98,11 @@
# ifdef __GNUC__ # ifdef __GNUC__
# if __GNUC__ >= 4 # if __GNUC__ >= 4
# define EAPI __attribute__ ((visibility("default"))) # define EAPI __attribute__ ((visibility("default")))
# define EAPI_MAIN __attribute__ ((visibility("default")))
# else # else
# define EAPI # define EAPI
# define EAPI_MAIN
# endif # endif
# else # else
# define EAPI # define EAPI
# define EAPI_MAIN
# endif # endif
#endif /* ! _WIN32 */ #endif /* ! _WIN32 */