eina: forgotten backport of 1e916e44f7e2eeb20057299dbceecbe8bf0910be

SVN revision: 83987

3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c80777d..1ee76c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -406,3 +406,7 @@
 2013-02-07  Cedric Bail
 
 	* honor tile size in Eina_Tiler.
+
+2013-02-16  Cedric Bail
+
+	* Fix portability issue on 64bits system for Eina_CList.
diff --git a/NEWS b/NEWS
index abd36e4..f764385 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Improvements:
 Fixes:
     * Prevent denial of service on Eina_Hash function.
     * Fix map leak in Eina_File infrastructure.
+    * Fix portability issue on 64bits system for Eina_CList.
 
 Changes since Eina 1.7.4:
 -------------------------
diff --git a/src/include/eina_clist.h b/src/include/eina_clist.h
index 4e7f63a..10cd6c7 100644
--- a/src/include/eina_clist.h
+++ b/src/include/eina_clist.h
@@ -420,7 +420,7 @@ static inline void eina_clist_move_head(Eina_Clist *dst, Eina_Clist *src);
  */
 #undef EINA_CLIST_ENTRY
 #define EINA_CLIST_ENTRY(elem, type, field) \
-    ((type *)((char *)(elem) - (unsigned long)(&((type *)0)->field)))
+    ((type *)((char *)(elem) - (uintptr_t)(&((type *)0)->field)))
 
 #include "eina_inline_clist.x"