summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavyd Madeley <davyd@fugro-fsi.com.au>2005-11-21 02:58:36 +0000
committerDavyd Madeley <davyd@src.gnome.org>2005-11-21 02:58:36 +0000
commitd1da3438d444f903e9c1cb5f026eefa537f5fab2 (patch)
tree3a4bcb7dceb217770035df4acbe0ce34debffd74
parentf9a4aea0cf44f51795d9cb8efa310ff9c6fa5695 (diff)
downloadmetacity-d1da3438d444f903e9c1cb5f026eefa537f5fab2.tar.gz
metacity-d1da3438d444f903e9c1cb5f026eefa537f5fab2.tar.bz2
Use GPOINTER_TO_INT() macro instead of cast to allow compilation on 64-bit
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.
-rw-r--r--ChangeLog6
-rw-r--r--src/edge-resistance.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 66d7b3e..9b76b52 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 cad47ed..f4d1762 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;