From d1da3438d444f903e9c1cb5f026eefa537f5fab2 Mon Sep 17 00:00:00 2001 From: Davyd Madeley Date: Mon, 21 Nov 2005 02:58:36 +0000 Subject: [PATCH] Use GPOINTER_TO_INT() macro instead of cast to allow compilation on 64-bit 2005-11-21 Davyd Madeley * 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. --- ChangeLog | 6 ++++++ src/edge-resistance.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 66d7b3e2f..9b76b5296 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-21 Davyd Madeley + + * 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 * 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;