eio: remove the need to order the header correctly for Windows.

diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index 8edd4abc86af1cd78d289caa3cc7fbb79245cde1..c0d447710462854496925771922fdd8459bd916d 100644 (file)
--- 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 1c46d77c45c5c312976e184aa021606f8b575ab3..e28870bf0226a8cfb15f5649c9ed3ed8dc49c7ed 100644 (file)
--- 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