commit f3e3285dcdcf84aa3f19ae888a914660922ad5f7
author ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 03 15:12:16 2007 +0000
committer ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 03 15:12:16 2007 +0000
tree 55ecdba112be12e12851967f03be58d0fb492a3e
parent 2e13d23ac089e554fc0efd285ec2176ca36576c7

Fix some compiler warnings.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3520 c046a42c-6fe2-441c-8c8c-71466251a162

linux-user/qemu.h

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index d0f650e..6fc0bbf 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -9,10 +9,16 @@
 #ifdef TARGET_ABI32
 typedef uint32_t abi_ulong;
 typedef int32_t abi_long;
+#define TARGET_ABI_FMT_lx "%08x"
+#define TARGET_ABI_FMT_ld "%d"
+#define TARGET_ABI_FMT_lu "%u"
 #define TARGET_ABI_BITS 32
 #else
 typedef target_ulong abi_ulong;
 typedef target_long abi_long;
+#define TARGET_ABI_FMT_lx TARGET_FMT_lx
+#define TARGET_ABI_FMT_ld TARGET_FMT_ld
+#define TARGET_ABI_FMT_lu TARGET_FMT_lu
 #define TARGET_ABI_BITS TARGET_LONG_BITS
 #endif
 

linux-user/strace.c

diff --git a/linux-user/strace.c b/linux-user/strace.c
index 14323e7..c645ddf 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -106,7 +106,8 @@
             return;
 
 	tv = lock_user(tv_addr, sizeof(*tv), 1);
-        gemu_log("{%d,%d}", tv->tv_sec, tv->tv_usec);
+        gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}",
+        	 tv->tv_sec, tv->tv_usec);
         unlock_user(tv, tv_addr, 0);
     } else
         gemu_log("NULL");
@@ -220,12 +221,15 @@
     }
 }
 
+#if 0 /* currently unused */
 static void
 print_syscall_ret_raw(struct syscallname *name, target_long ret)
 {
         gemu_log(" = " TARGET_FMT_lx "\n", ret);
 }
+#endif
 
+#ifdef TARGET_NR__newselect
 static void
 print_syscall_ret_newselect(struct syscallname *name, target_long ret)
 {
@@ -239,6 +243,7 @@
     print_timeval(newselect_arg5);
     gemu_log(")\n");
 }
+#endif
 
 /*
  * An array of all of the syscalls we know about