From 0b4a911450343896f8c9c7452e6bb6971acf7780 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 28 Apr 2015 15:12:03 +0200 Subject: [PATCH] efreet: remove the need to order the header correctly for Windows. --- src/lib/efreet/Efreet.h | 3 +++ src/lib/efreet/efreet_cache_private.h | 29 +++++++++++++++++++++++++++ src/lib/efreet/efreet_private.h | 29 +++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/src/lib/efreet/Efreet.h b/src/lib/efreet/Efreet.h index 419e5ff531..e83784da1d 100644 --- a/src/lib/efreet/Efreet.h +++ b/src/lib/efreet/Efreet.h @@ -149,6 +149,9 @@ EAPI int efreet_shutdown(void); */ EAPI void efreet_lang_reset(void); +#undef EAPI +#define EAPI + #ifdef __cplusplus } #endif diff --git a/src/lib/efreet/efreet_cache_private.h b/src/lib/efreet/efreet_cache_private.h index af178baaad..79dbfa0c24 100644 --- a/src/lib/efreet/efreet_cache_private.h +++ b/src/lib/efreet/efreet_cache_private.h @@ -12,6 +12,32 @@ #define EFREET_CACHE_VERSION "__efreet//version" #define EFREET_CACHE_ICON_FALLBACK "__efreet_fallback" +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_EFREET_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EFREET_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif + EAPI const char *efreet_desktop_util_cache_file(void); EAPI const char *efreet_desktop_cache_file(void); EAPI const char *efreet_icon_cache_file(const char *theme); @@ -57,4 +83,7 @@ struct _Efreet_Cache_Desktop double check_time; /**< Last time we check for disk modification */ }; +#undef EAPI +#define EAPI + #endif diff --git a/src/lib/efreet/efreet_private.h b/src/lib/efreet/efreet_private.h index 21f75173be..9455485f2f 100644 --- a/src/lib/efreet/efreet_private.h +++ b/src/lib/efreet/efreet_private.h @@ -1,6 +1,32 @@ #ifndef EFREET_PRIVATE_H #define EFREET_PRIVATE_H +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_EFREET_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EFREET_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif + #ifdef ENABLE_NLS # include # define _(str) dgettext(PACKAGE, str) @@ -224,6 +250,9 @@ EAPI void efreet_fsetowner(int fd); EAPI extern int efreet_cache_update; +#undef EAPI +#define EAPI + /** * @} */