summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-11-09 15:25:51 -0800
committerCedric Bail <cedric@osg.samsung.com>2017-11-09 15:25:51 -0800
commitfee2b1beb4e46b1a3b0509bf407efae243a3536e (patch)
treeeaf4196fed087bc3e94db861283fbfda665ea9ea /src
parentbd83a76393a1e5ceb7f725916a7eb9d41305f788 (diff)
ecore_con: add support for EFL_MAIN with ecore_con support.
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore/efl_general.h13
-rw-r--r--src/lib/ecore_con/Efl_Net.h3
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 @@
10#undef __EFL_MAIN_CONSTRUCTOR 10#undef __EFL_MAIN_CONSTRUCTOR
11#undef __EFL_MAIN_DESTRUCTOR 11#undef __EFL_MAIN_DESTRUCTOR
12#undef __EFL_UI 12#undef __EFL_UI
13#undef __EFL_NET
13#undef EFL_MAIN 14#undef EFL_MAIN
14#undef EFL_MAIN_EX 15#undef EFL_MAIN_EX
15 16
@@ -38,10 +39,14 @@
38#endif 39#endif
39 40
40#define __EFL_MAIN_CONSTRUCTOR \ 41#define __EFL_MAIN_CONSTRUCTOR \
42 __EFL_NET(ecore_con_init();) \
43 __EFL_NET(ecore_con_url_init();) \
41 __EFL_UI(elm_init(argc, argv);) 44 __EFL_UI(elm_init(argc, argv);)
42 45
43#define __EFL_MAIN_DESTRUCTOR \ 46#define __EFL_MAIN_DESTRUCTOR \
44 __EFL_UI(elm_shutdown();) 47 __EFL_UI(elm_shutdown();) \
48 __EFL_NET(ecore_con_url_shutdown();) \
49 __EFL_NET(ecore_con_shutdown();)
45 50
46#ifdef __EFL_UI_IS_REQUIRED 51#ifdef __EFL_UI_IS_REQUIRED
47# define __EFL_UI(...) __VA_ARGS__ 52# define __EFL_UI(...) __VA_ARGS__
@@ -49,6 +54,12 @@
49# define __EFL_UI(...) 54# define __EFL_UI(...)
50#endif 55#endif
51 56
57#ifdef __EFL_NET_IS_REQUIRED
58# define __EFL_NET(...) __VA_ARGS__
59#else
60# define __EFL_NET(...)
61#endif
62
52#define _EFL_APP_VERSION_SET() \ 63#define _EFL_APP_VERSION_SET() \
53 do { \ 64 do { \
54 if (efl_build_version_set) \ 65 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 @@
8#else 8#else
9# include <netdb.h> 9# include <netdb.h>
10#endif 10#endif
11
12#define __EFL_NET_IS_REQUIRED
13
11#include <Efl_Core.h> 14#include <Efl_Core.h>
12 15
13#ifdef EAPI 16#ifdef EAPI