cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=07da1facaa564bea1b437e23cd75028e8981043e
commit 07da1facaa564bea1b437e23cd75028e8981043e Author: Cedric Bail <[email protected]> Date: Tue Nov 14 20:14:44 2017 -0800 elementary: protect from stall include. This should be reverted before next release as this header was only there during this release cycle. --- src/lib/ecore/efl_general.h | 1 + src/lib/elementary/elm_general.h | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h index 2c850c7095..b88c62e407 100644 --- a/src/lib/ecore/efl_general.h +++ b/src/lib/ecore/efl_general.h @@ -67,6 +67,7 @@ #ifdef __EFL_UI_IS_REQUIRED # define __EFL_UI(...) __VA_ARGS__ +# define __EFL_UI_IS_DEFINED #else # define __EFL_UI(...) #endif diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h index 7564f1217c..45117bc921 100644 --- a/src/lib/elementary/elm_general.h +++ b/src/lib/elementary/elm_general.h @@ -96,7 +96,13 @@ extern EAPI double _elm_startup_time; #define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); ret__ = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret__; } #endif -#include "Efl_Ui.h" +#define __EFL_UI_IS_REQUIRED + +#include "efl_general.h" + +#ifndef __EFL_UI_IS_DEFINED +# error "You have an old efl_general.h installed in your local include/elementary-1/ remove it first." +#endif /**************************************************************************/ /* General calls */ --
