diff --git a/ChangeLog b/ChangeLog
index 66d7b3e2f..9b76b5296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-21  Davyd Madeley  <davyd@fugro-fsi.com.au>
+
+	* src/edge-resistance.c (meta_display_compute_resistance_and_snap):
+	  Use GPOINTER_TO_INT() macro instead of cast to allow compilation on
+	  64-bit architectures without warning.
+
 2005-11-19  Elijah Newren  <newren@gmail.com>
 
 	* src/edge-resistance.c (apply_edge_resistance): differentiate
diff --git a/src/edge-resistance.c b/src/edge-resistance.c
index cad47edac..f4d176221 100644
--- a/src/edge-resistance.c
+++ b/src/edge-resistance.c
@@ -1112,7 +1112,7 @@ meta_display_compute_resistance_and_snapping_edges (MetaDisplay *display)
            * stacking position than this one.
            */
           while (rem_win_stacking && 
-                 stack_position >= (int)rem_win_stacking->data)
+                 stack_position >= GPOINTER_TO_INT (rem_win_stacking->data))
             {
               rem_windows      = rem_windows->next;
               rem_win_stacking = rem_win_stacking->next;