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

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.
This commit is contained in:
Jean-Philippe Andre 2016-08-01 16:06:44 +09:00
parent f00c078b9b
commit 67ab4e3b4d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/eina/eina_types.h
View File

@ -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)

5
src/lib/eo/Eo.h
View File

@ -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 */