headers: ensure Efl.h is always included behind BETA define guards

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8244
This commit is contained in:
Mike Blumenkrantz 2019-03-07 17:42:01 -05:00 committed by Cedric BAIL
parent 58fb597acc
commit 12e78b5059
7 changed files with 16 additions and 8 deletions

View File

@ -274,7 +274,10 @@
#include <Eina.h>
#include <Eo.h>
#ifdef EFL_BETA_API_SUPPORT
#include <Efl.h>
#endif
#ifdef EAPI
# undef EAPI

View File

@ -5,8 +5,9 @@
#include <Eina.h>
#include <Eo.h>
#ifdef EFL_BETA_API_SUPPORT
#include <Efl.h>
#endif
#ifdef EAPI
# undef EAPI
#endif

View File

@ -3,8 +3,9 @@
#include <Eina.h>
#include <Eo.h>
#ifdef EFL_BETA_API_SUPPORT
#include <Efl.h>
#endif
#ifdef EAPI
# undef EAPI
#endif

View File

@ -80,8 +80,9 @@
#include <stdarg.h>
#include <Efl_Config.h>
#include <Eo.h>
#ifdef EFL_BETA_API_SUPPORT
#include <Efl.h>
#endif
#ifdef EAPI
# undef EAPI
#endif

View File

@ -2,7 +2,6 @@
#define _ELDBUS_MODEL_H
#include <Eldbus.h>
#include <Efl.h>
#include <Eo.h>
#ifdef __cplusplus
@ -10,7 +9,7 @@ extern "C" {
#endif
#ifdef EFL_BETA_API_SUPPORT
#include <Efl.h>
#include <eldbus_model_connection.eo.h>
#include <eldbus_model_object.eo.h>
#include <eldbus_model_proxy.eo.h>

View File

@ -70,7 +70,6 @@
#include <Efreet_Mime.h>
#include <Efreet_Trash.h>
#include <Ethumb_Client.h>
#include <Efl.h>
#ifdef ELM_ELOCATION
#include <Elocation.h>
@ -148,6 +147,7 @@ EAPI extern Elm_Version *elm_version;
#include <elm_focus.h>
#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
#include <Efl.h>
/* FIXME: wtf? */
#ifndef EFL_UI_RADIO_EVENT_CHANGED
# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED

View File

@ -168,10 +168,11 @@
#include <Eina.h>
/* This include has been added to support Eo in Evas */
#include <Eo.h>
#ifdef EFL_BETA_API_SUPPORT
/* This include has been added to support Eo in Evas */
#include <Efl.h>
#endif
#include <Evas_Loader.h>
@ -209,7 +210,9 @@ extern "C" {
#ifndef EFL_NOLEGACY_API_SUPPORT
#include <Evas_Legacy.h>
#endif
#ifdef EFL_BETA_API_SUPPORT
#include <Evas_Eo.h>
#endif
#ifdef __cplusplus
}