From 48dad59956633f87c3c846f0e97500406b6ac685 Mon Sep 17 00:00:00 2001
From: corinna <corinna>
Date: Thu, 10 Apr 2008 09:27:57 +0000
Subject: [PATCH] 	* cygwin.din (wprintf): Remove. 	(_wprintf):
 Ditto. 	* syscalls.cc (wprintf): Ditto. 	*
 include/cygwin/version.h: Add FIXME comment.

---
 winsup/cygwin/ChangeLog                |  7 +++++++
 winsup/cygwin/cygwin.din               |  2 --
 winsup/cygwin/include/cygwin/version.h |  2 ++
 winsup/cygwin/syscalls.cc              | 15 ---------------
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5070c7267b..1875ede012 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygwin.din (wprintf): Remove.
+	(_wprintf): Ditto.
+	* syscalls.cc (wprintf): Ditto.
+	* include/cygwin/version.h: Add FIXME comment.
+
 2008-04-08  Corinna Vinschen  <corinna@vinschen.de>
 
 	* mount.cc (mount_info::from_fstab): Read user fstab files from
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index ee2e4bf4a5..5e08b71595 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -1732,8 +1732,6 @@ wmemcmp NOSIGFE
 wmemcpy NOSIGFE
 wmemmove NOSIGFE
 wmemset NOSIGFE
-wprintf SIGFE
-_wprintf = wprintf SIGFE
 write SIGFE
 _write = write SIGFE
 writev SIGFE
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 9bd809d0d8..a4081d6abb 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -325,6 +325,8 @@ details. */
 	   lremovexattr, fremovexattr.
       181: Export cygwin_conv_path, cygwin_create_path, cygwin_conv_path_list.
       182: Export lockf.
+      FIXME: Removed 12 year old and entirely wrong wprintf function at
+           this point.  We need a working implementation soon.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 7ef3501a34..881b9d1ebe 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -2729,21 +2729,6 @@ __assertfail ()
   exit (99);
 }
 
-/* FIXME: to do this right, maybe work out the usoft va_list machine
-   and use wsvprintfW instead?
-*/
-extern "C" int
-wprintf (const char *fmt, ...)
-{
-  va_list ap;
-  int ret;
-
-  va_start (ap, fmt);
-  ret = vprintf (fmt, ap);
-  va_end (ap);
-  return ret;
-}
-
 extern "C" int
 vhangup ()
 {
-- 
2.11.0