cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=61e271890731a8563544cc7dfcae40ab00dc35b2
commit 61e271890731a8563544cc7dfcae40ab00dc35b2
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Tue Apr 28 16:52:48 2015 +0200
ethumb: remove the need to order the header correctly for Windows.
---
src/lib/ethumb/Ethumb.h | 7 +++++--
src/lib/ethumb_client/Ethumb_Client.h | 12 +++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/lib/ethumb/Ethumb.h b/src/lib/ethumb/Ethumb.h
index 5d1fb0c..2e497e1 100644
--- a/src/lib/ethumb/Ethumb.h
+++ b/src/lib/ethumb/Ethumb.h
@@ -565,7 +565,7 @@ EAPI Eina_Bool ethumb_cmp(const Ethumb *e1, const Ethumb
*e2) EINA_ARG_NONNULL(1
EAPI int ethumb_hash(const void *key, int key_length) EINA_ARG_NONNULL(1)
EINA_WARN_UNUSED_RESULT EINA_PURE;
EAPI int ethumb_key_cmp(const void *key1, int key1_length,
- const void *key2, int key2_length) EINA_ARG_NONNULL(1,
3) EINA_WARN_UNUSED_RESULT EINA_PURE;
+ const void *key2, int key2_length) EINA_ARG_NONNULL(1,
3) EINA_WARN_UNUSED_RESULT EINA_PURE;
EAPI unsigned int ethumb_length(const void *key) EINA_PURE
EINA_WARN_UNUSED_RESULT;
/**
@@ -575,8 +575,11 @@ EAPI unsigned int ethumb_length(const void *key) EINA_PURE
EINA_WARN_UNUSED_RESU
/**
* @}
*/
-
#ifdef __cplusplus
}
#endif
+
+#undef EAPI
+#define EAPI
+
#endif /* __ETHUMB_H__ */
diff --git a/src/lib/ethumb_client/Ethumb_Client.h
b/src/lib/ethumb_client/Ethumb_Client.h
index 3c3f95d..1ec8178 100644
--- a/src/lib/ethumb_client/Ethumb_Client.h
+++ b/src/lib/ethumb_client/Ethumb_Client.h
@@ -201,9 +201,9 @@ typedef void (*Ethumb_Client_Async_Error_Cb)(Ethumb_Client
*ethumbd, void *data)
typedef struct _Ethumb_Client_Async Ethumb_Client_Async;
EAPI Ethumb_Client_Async *ethumb_client_thumb_async_get(Ethumb_Client *client,
-
Ethumb_Client_Async_Done_Cb done,
-
Ethumb_Client_Async_Error_Cb error,
- const void *data);
+
Ethumb_Client_Async_Done_Cb done,
+
Ethumb_Client_Async_Error_Cb error,
+ const void *data);
EAPI void ethumb_client_thumb_async_cancel(Ethumb_Client *client,
Ethumb_Client_Async *request);
/**
* @}
@@ -212,9 +212,11 @@ EAPI void ethumb_client_thumb_async_cancel(Ethumb_Client
*client, Ethumb_Client_
/**
* @}
*/
-
-
#ifdef __cplusplus
}
#endif
+
+#undef EAPI
+#define EAPI
+
#endif /* __ETHUMB_CLIENT_H__ */
--
