diff options
| author | Cedric Bail <cedric@osg.samsung.com> | 2017-11-09 15:25:51 -0800 |
|---|---|---|
| committer | Cedric Bail <cedric@osg.samsung.com> | 2017-11-09 15:25:51 -0800 |
| commit | fee2b1beb4e46b1a3b0509bf407efae243a3536e (patch) | |
| tree | eaf4196fed087bc3e94db861283fbfda665ea9ea | |
| parent | bd83a76393a1e5ceb7f725916a7eb9d41305f788 (diff) | |
| download | efl-fee2b1beb4e46b1a3b0509bf407efae243a3536e.tar.gz | |
ecore_con: add support for EFL_MAIN with ecore_con support.
| -rw-r--r-- | src/lib/ecore/efl_general.h | 13 | ||||
| -rw-r--r-- | src/lib/ecore_con/Efl_Net.h | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h index b4ffdfe97a..c91f61fce2 100644 --- a/src/lib/ecore/efl_general.h +++ b/src/lib/ecore/efl_general.h @@ -10,6 +10,7 @@ #undef __EFL_MAIN_CONSTRUCTOR #undef __EFL_MAIN_DESTRUCTOR #undef __EFL_UI +#undef __EFL_NET #undef EFL_MAIN #undef EFL_MAIN_EX @@ -38,10 +39,14 @@ #endif #define __EFL_MAIN_CONSTRUCTOR \ + __EFL_NET(ecore_con_init();) \ + __EFL_NET(ecore_con_url_init();) \ __EFL_UI(elm_init(argc, argv);) #define __EFL_MAIN_DESTRUCTOR \ - __EFL_UI(elm_shutdown();) + __EFL_UI(elm_shutdown();) \ + __EFL_NET(ecore_con_url_shutdown();) \ + __EFL_NET(ecore_con_shutdown();) #ifdef __EFL_UI_IS_REQUIRED # define __EFL_UI(...) __VA_ARGS__ @@ -49,6 +54,12 @@ # define __EFL_UI(...) #endif +#ifdef __EFL_NET_IS_REQUIRED +# define __EFL_NET(...) __VA_ARGS__ +#else +# define __EFL_NET(...) +#endif + #define _EFL_APP_VERSION_SET() \ do { \ if (efl_build_version_set) \ diff --git a/src/lib/ecore_con/Efl_Net.h b/src/lib/ecore_con/Efl_Net.h index f98ff29ed4..5d163e7efd 100644 --- a/src/lib/ecore_con/Efl_Net.h +++ b/src/lib/ecore_con/Efl_Net.h @@ -8,6 +8,9 @@ #else # include <netdb.h> #endif + +#define __EFL_NET_IS_REQUIRED + #include <Efl_Core.h> #ifdef EAPI |