From 31b51a40346aff51180a8256ad4af8e1d88183cd Mon Sep 17 00:00:00 2001
From: Albert Cahalan <albert@users.sourceforge.net>
Date: Sun, 8 Nov 2009 00:02:55 +0000
Subject: [PATCH] printf fmt warnings that could crash 64-bit

---
 Makefile       | 4 +++-
 src/tuxpaint.c | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 534e7f7ea..2122b483d 100644
--- a/Makefile
+++ b/Makefile
@@ -282,12 +282,14 @@ release: releasedir
 	    tar -czvf tuxpaint-$(VER_VERSION).tar.gz tuxpaint-$(VER_VERSION)
 
 # "make olpc" builds the program for an OLPC XO:
+MAGIC_GOOD:=blur blocks_chalk_drip bricks calligraphy fade_darken\
+            fill flower foam grass mirror_flip shift smudge snow tint
 .PHONY: olpc
 olpc:
 	@echo
 	@echo "Building for an OLPC XO"
 	@echo
-	make PREFIX:=. OPTFLAGS:='-O2 -fno-tree-pre -march=athlon -mtune=generic -mpreferred-stack-boundary=2 -mmmx -m3dnow -fomit-frame-pointer -falign-functions=0 -falign-jumps=0 -DOLPC_XO -DSUGAR'
+	make PREFIX:=. MAGIC_C:=$(patsubst %,magic/src/%.c,$(MAGIC_GOOD)) OPTFLAGS:='-O2 -fno-tree-pre -march=athlon -mtune=generic -mpreferred-stack-boundary=2 -mmmx -m3dnow -fomit-frame-pointer -falign-functions=0 -falign-jumps=0 -DOLPC_XO -DSUGAR'
 
 # "make nokia770" builds the program for the Nokia 770.
 .PHONY: nokia770
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 81ee7ca0b..9755c4d7a 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -13836,7 +13836,7 @@ static int do_save(int tool, int dont_show_success_results)
 
 	  for(i=0; i < current_node->save_texttool_len; i++)
 	    {
-	      fprintf(fi, "%lc", current_node->save_texttool_str[i]);
+	      fprintf(fi, "%lc", (wint_t)current_node->save_texttool_str[i]);
 	    }
 
 	  fprintf(fi, "\n");
@@ -13861,7 +13861,7 @@ static int do_save(int tool, int dont_show_success_results)
 	  fprintf(fi, "\n\n");
 	}
       current_node = current_node->next_to_up_label_node;
-      printf("cur %i, red %i\n",current_node, first_label_node_in_redo_stack); //FIXAM
+      printf("cur %p, red %p\n",current_node, first_label_node_in_redo_stack); //FIXAM
     }
   fclose(fi);
   free(fname);
@@ -20993,8 +20993,8 @@ void delete_label_list(struct label_node** ref_head)
 
   while(current != NULL)
     {
-        printf("%x current\n", current); //FIXAM
-fflush(stdout);
+      printf("%p current\n", current); //FIXAM
+      fflush(stdout);
 
       next = current->next_to_up_label_node;
       free(current);