summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-07 17:42:01 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:06:22 -0800
commit12e78b50593a60e97dffb5048eac182b24ed802e (patch)
tree3db66605e86e453e77a8448c87887cf52afae51e
parent58fb597acc362a225f84110026d73979caa62268 (diff)
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
-rw-r--r--src/lib/ecore/Ecore.h3
-rw-r--r--src/lib/ecore/Efl_Core.h3
-rw-r--r--src/lib/ector/Ector.h3
-rw-r--r--src/lib/eldbus/Eldbus.h3
-rw-r--r--src/lib/eldbus/Eldbus_Model.h3
-rw-r--r--src/lib/elementary/Elementary.h2
-rw-r--r--src/lib/evas/Evas.h7
7 files changed, 16 insertions, 8 deletions
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index e31252a380..28b7af2d08 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -274,7 +274,10 @@
274 274
275#include <Eina.h> 275#include <Eina.h>
276#include <Eo.h> 276#include <Eo.h>
277
278#ifdef EFL_BETA_API_SUPPORT
277#include <Efl.h> 279#include <Efl.h>
280#endif
278 281
279#ifdef EAPI 282#ifdef EAPI
280# undef EAPI 283# undef EAPI
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
index 6ae81904ea..ab82063bef 100644
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@@ -5,8 +5,9 @@
5 5
6#include <Eina.h> 6#include <Eina.h>
7#include <Eo.h> 7#include <Eo.h>
8#ifdef EFL_BETA_API_SUPPORT
8#include <Efl.h> 9#include <Efl.h>
9 10#endif
10#ifdef EAPI 11#ifdef EAPI
11# undef EAPI 12# undef EAPI
12#endif 13#endif
diff --git a/src/lib/ector/Ector.h b/src/lib/ector/Ector.h
index e2268f3ad8..729f4e5280 100644
--- a/src/lib/ector/Ector.h
+++ b/src/lib/ector/Ector.h
@@ -3,8 +3,9 @@
3 3
4#include <Eina.h> 4#include <Eina.h>
5#include <Eo.h> 5#include <Eo.h>
6#ifdef EFL_BETA_API_SUPPORT
6#include <Efl.h> 7#include <Efl.h>
7 8#endif
8#ifdef EAPI 9#ifdef EAPI
9# undef EAPI 10# undef EAPI
10#endif 11#endif
diff --git a/src/lib/eldbus/Eldbus.h b/src/lib/eldbus/Eldbus.h
index ac88fd51cf..c69c056c41 100644
--- a/src/lib/eldbus/Eldbus.h
+++ b/src/lib/eldbus/Eldbus.h
@@ -80,8 +80,9 @@
80#include <stdarg.h> 80#include <stdarg.h>
81#include <Efl_Config.h> 81#include <Efl_Config.h>
82#include <Eo.h> 82#include <Eo.h>
83#ifdef EFL_BETA_API_SUPPORT
83#include <Efl.h> 84#include <Efl.h>
84 85#endif
85#ifdef EAPI 86#ifdef EAPI
86# undef EAPI 87# undef EAPI
87#endif 88#endif
diff --git a/src/lib/eldbus/Eldbus_Model.h b/src/lib/eldbus/Eldbus_Model.h
index 4f4aca2576..0bf925c2d4 100644
--- a/src/lib/eldbus/Eldbus_Model.h
+++ b/src/lib/eldbus/Eldbus_Model.h
@@ -2,7 +2,6 @@
2#define _ELDBUS_MODEL_H 2#define _ELDBUS_MODEL_H
3 3
4#include <Eldbus.h> 4#include <Eldbus.h>
5#include <Efl.h>
6#include <Eo.h> 5#include <Eo.h>
7 6
8#ifdef __cplusplus 7#ifdef __cplusplus
@@ -10,7 +9,7 @@ extern "C" {
10#endif 9#endif
11 10
12#ifdef EFL_BETA_API_SUPPORT 11#ifdef EFL_BETA_API_SUPPORT
13 12#include <Efl.h>
14#include <eldbus_model_connection.eo.h> 13#include <eldbus_model_connection.eo.h>
15#include <eldbus_model_object.eo.h> 14#include <eldbus_model_object.eo.h>
16#include <eldbus_model_proxy.eo.h> 15#include <eldbus_model_proxy.eo.h>
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 60bd21fa7f..85919a321f 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -70,7 +70,6 @@
70#include <Efreet_Mime.h> 70#include <Efreet_Mime.h>
71#include <Efreet_Trash.h> 71#include <Efreet_Trash.h>
72#include <Ethumb_Client.h> 72#include <Ethumb_Client.h>
73#include <Efl.h>
74 73
75#ifdef ELM_ELOCATION 74#ifdef ELM_ELOCATION
76#include <Elocation.h> 75#include <Elocation.h>
@@ -148,6 +147,7 @@ EAPI extern Elm_Version *elm_version;
148#include <elm_focus.h> 147#include <elm_focus.h>
149 148
150#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT) 149#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
150#include <Efl.h>
151/* FIXME: wtf? */ 151/* FIXME: wtf? */
152#ifndef EFL_UI_RADIO_EVENT_CHANGED 152#ifndef EFL_UI_RADIO_EVENT_CHANGED
153# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED 153# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index ad3f16fe4a..67cdfa262e 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -168,10 +168,11 @@
168 168
169#include <Eina.h> 169#include <Eina.h>
170 170
171/* This include has been added to support Eo in Evas */
172#include <Eo.h> 171#include <Eo.h>
172#ifdef EFL_BETA_API_SUPPORT
173/* This include has been added to support Eo in Evas */
173#include <Efl.h> 174#include <Efl.h>
174 175#endif
175 176
176#include <Evas_Loader.h> 177#include <Evas_Loader.h>
177 178
@@ -209,7 +210,9 @@ extern "C" {
209#ifndef EFL_NOLEGACY_API_SUPPORT 210#ifndef EFL_NOLEGACY_API_SUPPORT
210#include <Evas_Legacy.h> 211#include <Evas_Legacy.h>
211#endif 212#endif
213#ifdef EFL_BETA_API_SUPPORT
212#include <Evas_Eo.h> 214#include <Evas_Eo.h>
215#endif
213 216
214#ifdef __cplusplus 217#ifdef __cplusplus
215} 218}