From 1dc72e4ffeddaad3982c8ea7978aba99f63867a4 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 2 Jan 2001 17:02:20 +0000 Subject: Update. * libio/wgenops.c (_IO_wdoallocbuf): Use correct wide access macro. (_IO_switch_to_wget_mode): Likewise. (_IO_sputbackwc): Likewise. (_IO_sungetwc): Use wint_t for result. * stdio-common/vfscanf.c (__vfscanf): Use WINT_T for done. * sysdeps/generic/strtol.c (strtol): Make cnt size_t for correct signedness. * sysdeps/generic/printf_fphex.c (putc): Cast _IO_putwc_unlocked to (int) to avoid warnings. * stdio-common/printf_fp.c (putc): Likewise. * stdio-common/printf_size.c (putc): Likewise. --- sysdeps/generic/printf_fphex.c | 4 ++-- sysdeps/generic/strtol.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/printf_fphex.c b/sysdeps/generic/printf_fphex.c index 19cbff8d70..dfc6df56c8 100644 --- a/sysdeps/generic/printf_fphex.c +++ b/sysdeps/generic/printf_fphex.c @@ -1,5 +1,5 @@ /* Print floating point number in hexadecimal notation according to ISO C99. - Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -43,7 +43,7 @@ names equal. */ # undef putc # define putc(c, f) (wide \ - ? _IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f)) + ? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f)) # define size_t _IO_size_t # define FILE _IO_FILE #else /* ! USE_IN_LIBIO */ diff --git a/sysdeps/generic/strtol.c b/sysdeps/generic/strtol.c index de6f276131..b2a232320c 100644 --- a/sysdeps/generic/strtol.c +++ b/sysdeps/generic/strtol.c @@ -1,5 +1,5 @@ /* Convert string representation of a number into an integer value. - Copyright (C) 1991,92,94,95,96,97,98,99,2000 Free Software Foundation, Inc. + Copyright (C) 1991,92,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -244,7 +244,7 @@ INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM) const STRING_TYPE *save, *end; int overflow; #ifndef USE_WIDE_CHAR - int cnt; + size_t cnt; #endif #ifdef USE_NUMBER_GROUPING -- cgit 1.4.1