summaryrefslogtreecommitdiff
path: root/src/lib/ecore/efl_general.h
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-11-14 20:10:33 -0800
committerCedric Bail <cedric@osg.samsung.com>2017-11-14 20:10:33 -0800
commitf455215ef52d3a339f3545c30d9c5dbc6ea99ef0 (patch)
treee916c9b6dbb5e6825407a890bd11d4cf578edb0c /src/lib/ecore/efl_general.h
parent663e31413a21030be8989eee82204f9351d2517c (diff)
ecore: always declare EFL_MAIN not just for application using the BETA flag.
Diffstat (limited to 'src/lib/ecore/efl_general.h')
-rw-r--r--src/lib/ecore/efl_general.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h
index 3a79e46d33..2c850c7095 100644
--- a/src/lib/ecore/efl_general.h
+++ b/src/lib/ecore/efl_general.h
@@ -1,18 +1,3 @@
1#ifdef EFL_BETA_API_SUPPORT
2
3// This file is designed to be included again and again
4// so cleanup last inclusion before generating this one.
5#undef _EFL_VERSION_MICRO
6#undef _EFL_VERSION_REVISION
7#undef _EFL_VERSION_FLAVOR
8#undef _EFL_BUILD_ID
9#undef _EFL_APP_VERSION_SET
10#undef __EFL_MAIN_CONSTRUCTOR
11#undef __EFL_MAIN_DESTRUCTOR
12#undef __EFL_UI
13#undef __EFL_NET
14#undef EFL_MAIN
15#undef EFL_MAIN_EX
16#undef EAPI_MAIN 1#undef EAPI_MAIN
17 2
18#ifdef _WIN32 3#ifdef _WIN32
@@ -30,6 +15,21 @@
30# define EAPI_MAIN 15# define EAPI_MAIN
31# endif 16# endif
32#endif /* ! _WIN32 */ 17#endif /* ! _WIN32 */
18#ifdef EFL_BETA_API_SUPPORT
19
20// This file is designed to be included again and again
21// so cleanup last inclusion before generating this one.
22#undef _EFL_VERSION_MICRO
23#undef _EFL_VERSION_REVISION
24#undef _EFL_VERSION_FLAVOR
25#undef _EFL_BUILD_ID
26#undef _EFL_APP_VERSION_SET
27#undef __EFL_MAIN_CONSTRUCTOR
28#undef __EFL_MAIN_DESTRUCTOR
29#undef __EFL_UI
30#undef __EFL_NET
31#undef EFL_MAIN
32#undef EFL_MAIN_EX
33 33
34#ifdef EFL_VERSION_MICRO 34#ifdef EFL_VERSION_MICRO
35# define _EFL_VERSION_MICRO EFL_VERSION_MICRO 35# define _EFL_VERSION_MICRO EFL_VERSION_MICRO