From 1e916e44f7e2eeb20057299dbceecbe8bf0910be Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric@efl.so>
Date: Sat, 16 Feb 2013 10:54:36 +0100
Subject: [PATCH] eina: improve Eina_Clist support for 64bits system.

This warning are triggered by a cross compilation as previously stated.
---
 ChangeLog                 | 4 ++++
 NEWS                      | 1 +
 src/lib/eina/eina_clist.h | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5e062c70f4..e749cdc67e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-16  Cedric Bail
+
+	* Eina: improved Eina_Clist support for 64bits system.
+
 2013-02-15  Tom Hacohen (TAsn)
 
         * Edje textblock: Improved textblock fit and added support for
diff --git a/NEWS b/NEWS
index 7a8c8681d6..a5c702aece 100644
--- a/NEWS
+++ b/NEWS
@@ -109,6 +109,7 @@ Improvements:
     * edje entry : Support &, < and > in preedit string
     * eina: Eina_Tiler now take tile size into account.
     * edje: reduce memory consumption of Edje program handler.
+    * eina, evas: improved support for 64bits system.
 
 Fixes:
     * Fix a memory leak in ecore_con_dns when using ecore_con_server_connect
diff --git a/src/lib/eina/eina_clist.h b/src/lib/eina/eina_clist.h
index 4e7f63a614..10cd6c72cd 100644
--- a/src/lib/eina/eina_clist.h
+++ b/src/lib/eina/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"