Avoid gcc warning "cast from pointer to integer of different size".

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index cf4968dbdd25abfbb85413e4bafe0b5add748aab..935caed722048c8a7cf1577d0e3684a7f3d7025c 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-23  Bruno Haible  <bruno@clisp.org>
+
+       Avoid gcc warning "cast from pointer to integer of different size".
+       * lib/glibconfig.in.h (GPOINTER_TO_INT, GINT_TO_POINTER): Cast through
+       intptr_t.
+       (GPOINTER_TO_UINT, GUINT_TO_POINTER: Cast through uintptr_t.
+
 2009-05-01  Bruno Haible  <bruno@clisp.org>
 
        Avoid compiler warnings when redefining macros defined by <libintl.h>.

diff --git a/gnulib-local/lib/glibconfig.in.h b/gnulib-local/lib/glibconfig.in.h
index 45311dbd22d87485e11466a25544aadec0b33d4f..9a73ea20d83594a266daf16997cbe312c36f5a5d 100644 (file)
--- a/gnulib-local/lib/glibconfig.in.h
+++ b/gnulib-local/lib/glibconfig.in.h
@@ -40,11 +40,11 @@ typedef uint32_t guint32;
 typedef size_t gsize;
 typedef ssize_t gssize;
 
-#define GPOINTER_TO_INT(p)     ((gint)   (p))
-#define GPOINTER_TO_UINT(p)    ((guint)  (p))
+#define GPOINTER_TO_INT(p)     ((gint)  (intptr_t)  (p))
+#define GPOINTER_TO_UINT(p)    ((guint) (uintptr_t) (p))
 
-#define GINT_TO_POINTER(i)     ((gpointer)  (i))
-#define GUINT_TO_POINTER(u)    ((gpointer)  (u))
+#define GINT_TO_POINTER(i)     ((gpointer) (intptr_t)  (i))
+#define GUINT_TO_POINTER(u)    ((gpointer) (uintptr_t) (u))
 
 #define g_memmove memmove