Fix all problems reported by the test suite.

From-SVN: r15505

diff --git a/libio/ChangeLog b/libio/ChangeLog
index d85c970ad830ea8281de9d0e89707cc4ea6ea799..0e75530290117e5bc89b84eb347c4e1607137c01 100644 (file)
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,9 @@
+1997-09-17 04:08  Ulrich Drepper  <drepper@cygnus.com>
+
+       * iostream.cc: Add forward declaration for __cvt_double.
+       * libio.h: Define _IO_USE_DTOA is _G_HAVE_PRINTF_FP is not defined.
+       * strops.c (_IO_str_count): Correct last change.
+
 1997-09-17 02:50  Ulrich Drepper  <drepper@cygnus.com>
 
        * libioP.h: Define __set_errno if not already defined.

diff --git a/libio/iostream.cc b/libio/iostream.cc
index 217b2e29b9f71939b7fcbcb62d0385e0e5e38645..9c815aa85e2b21b6c3db61aaa8a0a7314d5a15f4 100644 (file)
--- a/libio/iostream.cc
+++ b/libio/iostream.cc
@@ -42,6 +42,10 @@ extern "C" int __printf_fp (_IO_FILE *, const struct printf_info *,
                            const void *const *);
 #else
 #include "floatio.h"
+# ifndef _IO_USE_DTOA
+int __cvt_double(double number, register int prec, int flags, int *signp,
+                 int fmtch, char *startp, char *endp)
+# endif
 #endif
 
 #define        BUF             (MAXEXP+MAXFRACT+1)     /* + decimal point */

diff --git a/libio/libio.h b/libio/libio.h
index 10fcfed230d8fb2447e8dd7f032fbb2b7938027d..2eec1c27a52af1ffe266f160c2b259a504fe8028 100644 (file)
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -71,6 +71,9 @@
 # define const
 #endif
 #define _IO_UNIFIED_JUMPTABLES 1
+#ifndef _G_HAVE_PRINTF_FP
+# define _IO_USE_DTOA 1
+#endif
 
 #if 0
 # ifdef _IO_NEED_STDARG_H

diff --git a/libio/strops.c b/libio/strops.c
index f7c22627e7197b0cc0b568381e9cd7e6729f1fbb..a9f812e04511cf9d23962cea0b6b9c292afb57da 100644 (file)
--- a/libio/strops.c
+++ b/libio/strops.c
@@ -200,8 +200,8 @@ _IO_ssize_t
 _IO_str_count (fp)
      _IO_FILE *fp;
 {
-  return ((fp->_IO_write_end > fp->_IO_read_end
-          ? fp->_IO_write_end : fp->_IO_read_end)
+  return ((fp->_IO_write_ptr > fp->_IO_read_end
+          ? fp->_IO_write_ptr : fp->_IO_read_end)
          - fp->_IO_read_base);
 }