cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=84ddee331baa446bfa01fd21820b35d49cdbe68f
commit 84ddee331baa446bfa01fd21820b35d49cdbe68f
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Tue Apr 28 15:12:42 2015 +0200
eio: remove the need to order the header correctly for Windows.
---
src/lib/eio/Eio.h | 2 ++
src/lib/eio/eio_model.h | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index 8edd4ab..c0d4477 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -1296,5 +1296,7 @@ EAPI const char *eio_monitor_path_get(Eio_Monitor
*monitor);
}
#endif
+#undef EAPI
+#define EAPI
#endif
diff --git a/src/lib/eio/eio_model.h b/src/lib/eio/eio_model.h
index 1c46d77..e28870b 100644
--- a/src/lib/eio/eio_model.h
+++ b/src/lib/eio/eio_model.h
@@ -33,6 +33,32 @@
#include <Efl.h>
#include <Eio.h>
+#ifdef EAPI
+# undef EAPI
+#endif
+
+#ifdef _WIN32
+# ifdef EFL_EIO_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
+# else
+# define EAPI __declspec(dllimport)
+# endif /* ! EFL_EIO_BUILD */
+#else
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+# define EAPI __attribute__ ((visibility("default")))
+# else
+# define EAPI
+# endif
+# else
+# define EAPI
+# endif
+#endif /* ! _WIN32 */
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -42,4 +68,8 @@ extern "C" {
#ifdef __cplusplus
}
#endif
+
+#undef EAPI
+#define EAPI
+
#endif //_EMODEL_EIO_H
--
