From 1ecbe5cffb8ebb84189e829f16d463c2aaac1bfa Mon Sep 17 00:00:00 2001
From: Cedric Bail <cedric@osg.samsung.com>
Date: Fri, 27 Oct 2017 17:15:14 -0700
Subject: [PATCH] ecore: add Efl_Core.h

---
 src/Makefile_Ecore.am        |  1 +
 src/lib/ecore/Ecore_Common.h |  7 +---
 src/lib/ecore/Ecore_Eo.h     | 10 ++---
 src/lib/ecore/Ecore_Legacy.h |  7 +---
 src/lib/ecore/Efl_Core.h     | 74 ++++++++++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+), 17 deletions(-)
 create mode 100644 src/lib/ecore/Efl_Core.h

diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 1a06496ac6..ad637161b4 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -64,6 +64,7 @@ lib/ecore/Ecore.h \
 lib/ecore/Ecore_Common.h \
 lib/ecore/Ecore_Legacy.h \
 lib/ecore/Ecore_Eo.h \
+lib/ecore/Efl_Core.h \
 lib/ecore/Ecore_Getopt.h
 
 nodist_installed_ecoremainheaders_DATA = \
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 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _ECORE_COMMON_H
+#define _ECORE_COMMON_H
 
 #include <Efl_Config.h>
 
@@ -3183,6 +3182,4 @@ EAPI Efl_Future *ecore_thread_future_run(Ecore_Thread_Future_Cb heavy, const voi
 
 #endif
 
-#ifdef __cplusplus
-}
 #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 @@
+#ifndef _ECORE_EO_H
+#define _ECORE_EO_H
+
 /* This include has been added to support Eo in Ecore */
 #include <Eo.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * @ingroup Ecore_Timer_Group
  *
@@ -148,7 +147,4 @@ EAPI Efl_Future *efl_future_iterator_race(Eina_Iterator *it);
  * @}
  */
 
-
-#ifdef __cplusplus
-}
 #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 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _ECORE_LEGACY_H
+#define _ECORE_LEGACY_H
 
 /**
  * @ingroup Ecore_Poller_Group
@@ -392,6 +391,4 @@ EAPI void *ecore_job_del(Ecore_Job *obj);
  * @}
  */
 
-#ifdef __cplusplus
-}
 #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 @@
+#ifndef _EFL_CORE_H
+#define _EFL_CORE_H
+
+#include <Efl_Config.h>
+
+#ifdef _MSC_VER
+# include <Evil.h>
+#endif
+
+#include <Eina.h>
+#include <Eo.h>
+#include <Efl.h>
+
+#ifdef EAPI
+# undef EAPI
+#endif
+
+#ifdef _WIN32
+# ifdef EFL_ECORE_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
+# else
+#  define EAPI __declspec(dllimport)
+# endif /* ! EFL_ECORE_BUILD */
+#else
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else
+#   define EAPI
+#  endif
+# else
+#  define EAPI
+# endif
+#endif /* ! _WIN32 */
+
+#ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <winsock2.h>
+# undef WIN32_LEAN_AND_MEAN
+#elif defined (__FreeBSD__) || defined (__OpenBSD__)
+# include <sys/select.h>
+# include <signal.h>
+#elif defined (__ANDROID__)
+# include <sys/select.h>
+#elif defined (__sun)
+# include <sys/siginfo.h>
+#else
+# include <sys/time.h>
+# if !defined (EXOTIC_NO_SIGNAL)
+#  include <signal.h>
+# endif
+#endif
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "Ecore_Common.h"
+#include "Ecore_Eo.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#undef EAPI
+#define EAPI
+
+#endif