diff options
| -rw-r--r-- | libio/ChangeLog | 6 | ||||
| -rw-r--r-- | libio/iostream.cc | 4 | ||||
| -rw-r--r-- | libio/libio.h | 3 | ||||
| -rw-r--r-- | libio/strops.c | 4 |
4 files changed, 15 insertions, 2 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog index d85c970..0e75530 100644 --- 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 217b2e2..9c815aa 100644 --- 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 10fcfed..2eec1c2 100644 --- 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 f7c2262..a9f812e 100644 --- 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); } |