summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-10-27 17:15:14 -0700
committerCedric Bail <cedric@osg.samsung.com>2017-10-27 18:51:38 -0700
commit1ecbe5cffb8ebb84189e829f16d463c2aaac1bfa (patch)
tree549b2075d720d65cf431385a584dbdd36b3f1a15 /src/lib
parentd81b73b1a74654bc8ee040077bd525e1c1c50630 (diff)
ecore: add Efl_Core.h
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore/Ecore_Common.h7
-rw-r--r--src/lib/ecore/Ecore_Eo.h10
-rw-r--r--src/lib/ecore/Ecore_Legacy.h7
-rw-r--r--src/lib/ecore/Efl_Core.h74
4 files changed, 81 insertions, 17 deletions
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index fc0eddaf25..999fb8633f 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -1,6 +1,5 @@
1#ifdef __cplusplus 1#ifndef _ECORE_COMMON_H
2extern "C" { 2#define _ECORE_COMMON_H
3#endif
4 3
5#include <Efl_Config.h> 4#include <Efl_Config.h>
6 5
@@ -3183,6 +3182,4 @@ EAPI Efl_Future *ecore_thread_future_run(Ecore_Thread_Future_Cb heavy, const voi
3183 3182
3184#endif 3183#endif
3185 3184
3186#ifdef __cplusplus
3187}
3188#endif 3185#endif
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 05de244d43..851f6a86bf 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -1,10 +1,9 @@
1#ifndef _ECORE_EO_H
2#define _ECORE_EO_H
3
1/* This include has been added to support Eo in Ecore */ 4/* This include has been added to support Eo in Ecore */
2#include <Eo.h> 5#include <Eo.h>
3 6
4#ifdef __cplusplus
5extern "C" {
6#endif
7
8/** 7/**
9 * @ingroup Ecore_Timer_Group 8 * @ingroup Ecore_Timer_Group
10 * 9 *
@@ -148,7 +147,4 @@ EAPI Efl_Future *efl_future_iterator_race(Eina_Iterator *it);
148 * @} 147 * @}
149 */ 148 */
150 149
151
152#ifdef __cplusplus
153}
154#endif 150#endif
diff --git a/src/lib/ecore/Ecore_Legacy.h b/src/lib/ecore/Ecore_Legacy.h
index e70c0a1b9b..a9931874c5 100644
--- a/src/lib/ecore/Ecore_Legacy.h
+++ b/src/lib/ecore/Ecore_Legacy.h
@@ -1,6 +1,5 @@
1#ifdef __cplusplus 1#ifndef _ECORE_LEGACY_H
2extern "C" { 2#define _ECORE_LEGACY_H
3#endif
4 3
5/** 4/**
6 * @ingroup Ecore_Poller_Group 5 * @ingroup Ecore_Poller_Group
@@ -392,6 +391,4 @@ EAPI void *ecore_job_del(Ecore_Job *obj);
392 * @} 391 * @}
393 */ 392 */
394 393
395#ifdef __cplusplus
396}
397#endif 394#endif
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
new file mode 100644
index 0000000000..0f670b50fb
--- /dev/null
+++ b/src/lib/ecore/Efl_Core.h
@@ -0,0 +1,74 @@
1#ifndef _EFL_CORE_H
2#define _EFL_CORE_H
3
4#include <Efl_Config.h>
5
6#ifdef _MSC_VER
7# include <Evil.h>
8#endif
9
10#include <Eina.h>
11#include <Eo.h>
12#include <Efl.h>
13
14#ifdef EAPI
15# undef EAPI
16#endif
17
18#ifdef _WIN32
19# ifdef EFL_ECORE_BUILD
20# ifdef DLL_EXPORT
21# define EAPI __declspec(dllexport)
22# else
23# define EAPI
24# endif /* ! DLL_EXPORT */
25# else
26# define EAPI __declspec(dllimport)
27# endif /* ! EFL_ECORE_BUILD */
28#else
29# ifdef __GNUC__
30# if __GNUC__ >= 4
31# define EAPI __attribute__ ((visibility("default")))
32# else
33# define EAPI
34# endif
35# else
36# define EAPI
37# endif
38#endif /* ! _WIN32 */
39
40#ifdef _WIN32
41# define WIN32_LEAN_AND_MEAN
42# include <winsock2.h>
43# undef WIN32_LEAN_AND_MEAN
44#elif defined (__FreeBSD__) || defined (__OpenBSD__)
45# include <sys/select.h>
46# include <signal.h>
47#elif defined (__ANDROID__)
48# include <sys/select.h>
49#elif defined (__sun)
50# include <sys/siginfo.h>
51#else
52# include <sys/time.h>
53# if !defined (EXOTIC_NO_SIGNAL)
54# include <signal.h>
55# endif
56#endif
57
58#include <sys/types.h>
59
60#ifdef __cplusplus
61extern "C" {
62#endif
63
64#include "Ecore_Common.h"
65#include "Ecore_Eo.h"
66
67#ifdef __cplusplus
68}
69#endif
70
71#undef EAPI
72#define EAPI
73
74#endif