From 2971f07610ed389a9ab8846bf88496f98f023ff5 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 24 Mar 2009 13:35:08 +0000
Subject: [PATCH] 	* cygcheck.cc (dump_sysinfo): Fix compiler warning in
 printf. 	* strace.cc (proc_child): Ditto. 	* ldd.cc: Remove now
 useless undef wcscasecmp.

---
 winsup/utils/ChangeLog   | 6 ++++++
 winsup/utils/cygcheck.cc | 2 +-
 winsup/utils/ldd.cc      | 1 -
 winsup/utils/strace.cc   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index a40e905e8..c67a94d38 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygcheck.cc (dump_sysinfo): Fix compiler warning in printf.
+	* strace.cc (proc_child): Ditto.
+	* ldd.cc: Remove now useless undef wcscasecmp.
+
 2009-03-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* passwd.c (usage): Change description for -d option according to
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index 4db15e6a7..052707ffe 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -1540,7 +1540,7 @@ dump_sysinfo ()
                        (LPBYTE) &obcaseinsensitive, &size);
       RegCloseKey (key);
     }
-  printf ("obcaseinsensitive set to %d\n\n", obcaseinsensitive);
+  printf ("obcaseinsensitive set to %lu\n\n", obcaseinsensitive);
 
   if (givehelp)
     {
diff --git a/winsup/utils/ldd.cc b/winsup/utils/ldd.cc
index 8797e3a11..7a7e04ab9 100644
--- a/winsup/utils/ldd.cc
+++ b/winsup/utils/ldd.cc
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#undef wcscasecmp /* Disable definition from Cygwin's internal wchar.h. */
 #include <locale.h>
 #include <sys/cygwin.h>
 #include <unistd.h>
diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
index 19d15bd6d..745da9d2c 100644
--- a/winsup/utils/strace.cc
+++ b/winsup/utils/strace.cc
@@ -651,7 +651,7 @@ proc_child (unsigned mask, FILE *ofile, pid_t pid)
 	      status = DBG_EXCEPTION_NOT_HANDLED;
 	      if (ev.u.Exception.dwFirstChance)
 		fprintf (ofile, "--- Process %lu, exception %p at %p\n", ev.dwProcessId,
-			 ev.u.Exception.ExceptionRecord.ExceptionCode,
+			 (void *) ev.u.Exception.ExceptionRecord.ExceptionCode,
 			 ev.u.Exception.ExceptionRecord.ExceptionAddress);
 	    }
 	  break;