From 156f921ad641a2f89d0355383d8e53a316edaa9a Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Thu, 24 Nov 2011 10:07:14 +0000
Subject: [PATCH] Fix 64-bit warnings

---
 src/grits-opengl.c       | 8 ++++----
 src/objects/grits-poly.c | 6 +++---
 src/plugins/elev.c       | 2 +-
 src/tile-test.c          | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index b51e767..59fea09 100644
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -182,7 +182,7 @@ static gboolean on_configure(GritsOpenGL *opengl, GdkEventConfigure *event, gpoi
 
 static gboolean _draw_level(gpointer key, gpointer value, gpointer user_data)
 {
-	g_debug("GritsOpenGL: _draw_level - level=%-4d", (int)key);
+	g_debug("GritsOpenGL: _draw_level - level=%-4ld", (glong)key);
 	GritsOpenGL *opengl = user_data;
 	struct RenderLevel *level = value;
 	int nsorted = 0, nunsorted = 0;
@@ -489,10 +489,10 @@ static gpointer grits_opengl_add(GritsViewer *_opengl, GritsObject *object,
 	g_assert(GRITS_IS_OPENGL(_opengl));
 	GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
 	g_mutex_lock(opengl->objects_lock);
-	struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)key);
+	struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)(gintptr)key);
 	if (!level) {
 		level = g_new0(struct RenderLevel, 1);
-		g_tree_insert(opengl->objects, (gpointer)key, level);
+		g_tree_insert(opengl->objects, (gpointer)(gintptr)key, level);
 	}
 	GList *list = sort ? &level->sorted : &level->unsorted;
 	/* Put the link in the list */
@@ -530,7 +530,7 @@ static GritsObject *grits_opengl_remove(GritsViewer *_opengl, GritsObject *objec
  ****************/
 static int _objects_cmp(gconstpointer _a, gconstpointer _b, gpointer _)
 {
-	gint a = (int)_a, b = (int)_b;
+	gintptr a = (gintptr)_a, b = (gintptr)_b;
 	return a < b ? -1 :
 	       a > b ?  1 : 0;
 }
diff --git a/src/objects/grits-poly.c b/src/objects/grits-poly.c
index 2b62997..67dca9a 100644
--- a/src/objects/grits-poly.c
+++ b/src/objects/grits-poly.c
@@ -153,7 +153,7 @@ static void grits_poly_pick(GritsObject *_poly, GritsOpenGL *opengl)
 
 static gboolean grits_poly_delete(gpointer list)
 {
-	glDeleteLists((guint)list, 1);
+	glDeleteLists((guintptr)list, 1);
 	return FALSE;
 }
 
@@ -242,8 +242,8 @@ static void grits_poly_finalize(GObject *_poly)
 {
 	//g_debug("GritsPoly: finalize");
 	GritsPoly *poly = GRITS_POLY(_poly);
-	if (poly->list[0]) g_idle_add(grits_poly_delete, (gpointer)poly->list[0]);
-	if (poly->list[1]) g_idle_add(grits_poly_delete, (gpointer)poly->list[1]);
+	if (poly->list[0]) g_idle_add(grits_poly_delete, (gpointer)(guintptr)poly->list[0]);
+	if (poly->list[1]) g_idle_add(grits_poly_delete, (gpointer)(guintptr)poly->list[1]);
 }
 
 static void grits_poly_class_init(GritsPolyClass *klass)
diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 383c509..7e4509f 100644
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -113,7 +113,7 @@ static guint16 *_load_bil(gchar *path)
 	g_file_get_contents(path, &data, &len, NULL);
 	g_debug("GritsPluginElev: load_bil %p", data);
 	if (len != TILE_SIZE) {
-		g_warning("GritsPluginElev: _load_bil - unexpected tile size %d, != %d",
+		g_warning("GritsPluginElev: _load_bil - unexpected tile size %ld, != %ld",
 				len, TILE_SIZE);
 		g_free(data);
 		return NULL;
diff --git a/src/tile-test.c b/src/tile-test.c
index a800b9c..0aeafbd 100644
--- a/src/tile-test.c
+++ b/src/tile-test.c
@@ -32,7 +32,7 @@ struct CacheState {
 void chunk_callback(gsize cur, gsize total, gpointer _state)
 {
 	struct CacheState *state = _state;
-	g_message("chunk_callback: %d/%d", cur, total);
+	g_message("chunk_callback: %ld/%ld", cur, total);
 
 	if (state->progress == NULL) {
 		state->progress = gtk_progress_bar_new();
-- 
2.43.2