summaryrefslogtreecommitdiff
path: root/src/lib/ecore/efl_general.h
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-11-14 21:04:55 -0800
committerCedric Bail <cedric@osg.samsung.com>2017-11-14 21:04:55 -0800
commit23902aabe959fb98b9b34ba843cda3515b1a00fb (patch)
tree77405bfb8ef8bdab820030d0f0570b91f5ac2b49 /src/lib/ecore/efl_general.h
parent07da1facaa564bea1b437e23cd75028e8981043e (diff)
elementary: make sure efl_general.h detection work also when you are not using BETA interface.
Diffstat (limited to 'src/lib/ecore/efl_general.h')
-rw-r--r--src/lib/ecore/efl_general.h31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h
index b88c62e407..e115c08bfc 100644
--- a/src/lib/ecore/efl_general.h
+++ b/src/lib/ecore/efl_general.h
@@ -1,4 +1,6 @@
1#undef EAPI_MAIN 1#undef EAPI_MAIN
2#undef __EFL_UI
3#undef __EFL_NET
2 4
3#ifdef _WIN32 5#ifdef _WIN32
4// There is no support for quicklaunch on windows, so no needs 6// There is no support for quicklaunch on windows, so no needs
@@ -15,6 +17,20 @@
15# define EAPI_MAIN 17# define EAPI_MAIN
16# endif 18# endif
17#endif /* ! _WIN32 */ 19#endif /* ! _WIN32 */
20
21#ifdef __EFL_UI_IS_REQUIRED
22# define __EFL_UI(...) __VA_ARGS__
23# define __EFL_UI_IS_DEFINED
24#else
25# define __EFL_UI(...)
26#endif
27
28#ifdef __EFL_NET_IS_REQUIRED
29# define __EFL_NET(...) __VA_ARGS__
30#else
31# define __EFL_NET(...)
32#endif
33
18#ifdef EFL_BETA_API_SUPPORT 34#ifdef EFL_BETA_API_SUPPORT
19 35
20// This file is designed to be included again and again 36// This file is designed to be included again and again
@@ -26,8 +42,6 @@
26#undef _EFL_APP_VERSION_SET 42#undef _EFL_APP_VERSION_SET
27#undef __EFL_MAIN_CONSTRUCTOR 43#undef __EFL_MAIN_CONSTRUCTOR
28#undef __EFL_MAIN_DESTRUCTOR 44#undef __EFL_MAIN_DESTRUCTOR
29#undef __EFL_UI
30#undef __EFL_NET
31#undef EFL_MAIN 45#undef EFL_MAIN
32#undef EFL_MAIN_EX 46#undef EFL_MAIN_EX
33 47
@@ -65,19 +79,6 @@
65 __EFL_NET(ecore_con_url_shutdown();) \ 79 __EFL_NET(ecore_con_url_shutdown();) \
66 __EFL_NET(ecore_con_shutdown();) 80 __EFL_NET(ecore_con_shutdown();)
67 81
68#ifdef __EFL_UI_IS_REQUIRED
69# define __EFL_UI(...) __VA_ARGS__
70# define __EFL_UI_IS_DEFINED
71#else
72# define __EFL_UI(...)
73#endif
74
75#ifdef __EFL_NET_IS_REQUIRED
76# define __EFL_NET(...) __VA_ARGS__
77#else
78# define __EFL_NET(...)
79#endif
80
81#define _EFL_APP_VERSION_SET() \ 82#define _EFL_APP_VERSION_SET() \
82 do { \ 83 do { \
83 if (efl_build_version_set) \ 84 if (efl_build_version_set) \