diff options
| author | Cedric BAIL <cedric@osg.samsung.com> | 2015-04-28 15:09:11 +0200 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-05-07 09:53:10 +0200 |
| commit | 59fb53c4cc41434da051626c75b5ffa4569d7c0d (patch) | |
| tree | 5d338f7627abf40572c1663a8c39d000570b0293 | |
| parent | ce5ccfb5bee5174b168f0df49b75df2ab3849454 (diff) | |
| download | efl-59fb53c4cc41434da051626c75b5ffa4569d7c0d.tar.gz | |
edje: remove the need to order the header correctly for Windows.
| -rw-r--r-- | src/lib/edje/Edje.h | 3 | ||||
| -rw-r--r-- | src/lib/edje/edje_private.h | 28 |
2 files changed, 31 insertions, 0 deletions
diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h index ccace36e1a..c13292f3d9 100644 --- a/src/lib/edje/Edje.h +++ b/src/lib/edje/Edje.h @@ -261,4 +261,7 @@ extern "C" { } #endif +#undef EAPI +#define EAPI + #endif diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 4abc5eb93e..5d9592bf3d 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -58,6 +58,31 @@ #endif #include "Edje.h" +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_EDJE_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EDJE_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif EAPI extern int _edje_default_log_dom ; @@ -2800,4 +2825,7 @@ typedef Eina_Bool (*MULTISENSE_FACTORY_INIT_FUNC) (Edje_Multisense_Env *); typedef RemixBase* (*MULTISENSE_SOUND_PLAYER_GET_FUNC) (Edje_Multisense_Env *); #endif +#undef EAPI +#define EAPI + #endif |