diff --git a/ChangeLog b/ChangeLog
index bc586d77b..6ebd79f34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-04  Tor Lillqvist  <tml@novell.com>
+
+	* tests/testglib.c: Avoid warning on Win64 by using gintptr cast
+	instead if long cast.
+
 2008-08-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/tests/testglib.c b/tests/testglib.c
index 255e34003..075460b1e 100644
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -242,7 +242,7 @@ node_build_string (GNode    *node,
   gchar *string;
   gchar c[2] = "_";
 
-  c[0] = ((gchar) ((long) (node->data)));
+  c[0] = ((gchar) ((gintptr) (node->data)));
 
   string = g_strconcat (*p ? *p : "", c, NULL);
   g_free (*p);
@@ -255,7 +255,7 @@ static void
 gnode_test (void)
 {
 #define	C2P(c)		((gpointer) ((long) (c)))
-#define	P2C(p)		((gchar) ((long) (p)))
+#define	P2C(p)		((gchar) ((gintptr) (p)))
   GNode *root;
   GNode *node;
   GNode *node_B;