[EGIT] [core/efl] master 30/55: edje: remove the need to order the header correctly for Windows.

[Cedric BAIL]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=59fb53c4cc41434da051626c75b5ffa4569d7c0d

commit 59fb53c4cc41434da051626c75b5ffa4569d7c0d
Author: Cedric BAIL <ced...@osg.samsung.com>
Date:   Tue Apr 28 15:09:11 2015 +0200

    edje: remove the need to order the header correctly for Windows.
---
 src/lib/edje/Edje.h         |  3 +++
 src/lib/edje/edje_private.h | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h
index ccace36..c13292f 100644
--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@@ -261,4 +261,7 @@ extern "C" {
 }
 #endif
 
+#undef EAPI
+#define EAPI
+
 #endif
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 4abc5eb..5d9592b 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -58,6 +58,31 @@
 #endif
 
 #include "Edje.h"
+#ifdef EAPI
+# undef EAPI
+#endif
+
+#ifdef _WIN32
+# ifdef EFL_EDJE_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
+# else
+#  define EAPI __declspec(dllimport)
+# endif /* ! EFL_EDJE_BUILD */
+#else
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else
+#   define EAPI
+#  endif
+# else
+#  define EAPI
+# endif
+#endif
 
 EAPI extern int _edje_default_log_dom ;
 
@@ -2800,4 +2825,7 @@ typedef Eina_Bool (*MULTISENSE_FACTORY_INIT_FUNC) 
(Edje_Multisense_Env *);
 typedef RemixBase* (*MULTISENSE_SOUND_PLAYER_GET_FUNC) (Edje_Multisense_Env *);
 #endif
 
+#undef EAPI
+#define EAPI
+
 #endif

--