diff options
| author | Cedric Bail <cedric@osg.samsung.com> | 2017-11-14 20:14:44 -0800 |
|---|---|---|
| committer | Cedric Bail <cedric@osg.samsung.com> | 2017-11-14 20:14:44 -0800 |
| commit | 07da1facaa564bea1b437e23cd75028e8981043e (patch) | |
| tree | 757bb8f9468302ee6af1348ee8d1bb5722e4567e | |
| parent | 88b2e28759dd515cce767854bdd2fbfc9d25034f (diff) | |
| download | efl-07da1facaa564bea1b437e23cd75028e8981043e.tar.gz | |
elementary: protect from stall include.
This should be reverted before next release as this header was only
there during this release cycle.
| -rw-r--r-- | src/lib/ecore/efl_general.h | 1 | ||||
| -rw-r--r-- | src/lib/elementary/elm_general.h | 8 |
2 files changed, 8 insertions, 1 deletions
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 */ |