From c3d2ba07bcb8c170e8b56f35b05e9930b5efc775 Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Fri, 22 Jun 2018 07:16:50 +0100 Subject: [PATCH] efreet: silent deprecated API build warnings. Silent warnings on EFL build. Warn on API "mis-use". --- src/lib/efreet/Efreet.h | 6 ++++++ src/lib/efreet/efreet_menu.c | 4 ++-- src/lib/efreet/efreet_menu.h | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/efreet/Efreet.h b/src/lib/efreet/Efreet.h index 77a994f775..22d2291f44 100644 --- a/src/lib/efreet/Efreet.h +++ b/src/lib/efreet/Efreet.h @@ -78,6 +78,12 @@ # undef EAPI #endif +#ifdef EFL_BUILD +# define EFREET_DEPRECATED_API +#else +# define EFREET_DEPRECATED_API EINA_DEPRECATED +#endif + #ifdef _WIN32 # ifdef EFL_BUILD # ifdef DLL_EXPORT diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c index 154c7acb9f..f48f13c07e 100644 --- a/src/lib/efreet/efreet_menu.c +++ b/src/lib/efreet/efreet_menu.c @@ -529,7 +529,7 @@ efreet_menu_file_set(const char *file) } /* deprecated */ -EINA_DEPRECATED EAPI void +EFREET_DEPRECATED_API EAPI void efreet_menu_async_get(Efreet_Menu_Cb func, const void *data) { char menu[PATH_MAX]; @@ -605,7 +605,7 @@ efreet_menu_get(void) } /* deprecated */ -EINA_DEPRECATED EAPI void +EFREET_DEPRECATED_API EAPI void efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, const void *data) { Efreet_Menu_Async *async; diff --git a/src/lib/efreet/efreet_menu.h b/src/lib/efreet/efreet_menu.h index dd05264dca..16d8de210d 100644 --- a/src/lib/efreet/efreet_menu.h +++ b/src/lib/efreet/efreet_menu.h @@ -84,7 +84,7 @@ EAPI void efreet_menu_file_set(const char *file); * * @deprecated */ -EINA_DEPRECATED EAPI void efreet_menu_async_get(Efreet_Menu_Cb func, const void *data); +EFREET_DEPRECATED_API EAPI void efreet_menu_async_get(Efreet_Menu_Cb func, const void *data); /** * @return Returns the Efreet_Menu representation of the default menu or @@ -102,7 +102,7 @@ EAPI Efreet_Menu *efreet_menu_get(void); * * @deprecated */ -EINA_DEPRECATED EAPI void efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, const void *data); +EFREET_DEPRECATED_API EAPI void efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, const void *data); /** * @param path The path of the menu to load