diff options
| author | Roland McGrath <roland@gnu.org> | 2006-01-08 08:24:11 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2006-01-08 08:24:11 +0000 |
| commit | 7b1b6d57d0417dcf3e8db1ce13fcb245a0bf2c33 (patch) | |
| tree | 29031842c56a41b6bd7c794424d7af960eef4b3c | |
| parent | 6ddd37a4b39d8023ce63326ce11d7735e141dc0e (diff) | |
| download | glibc-7b1b6d57d0417dcf3e8db1ce13fcb245a0bf2c33.tar.gz glibc-7b1b6d57d0417dcf3e8db1ce13fcb245a0bf2c33.tar.xz glibc-7b1b6d57d0417dcf3e8db1ce13fcb245a0bf2c33.zip | |
* stdio-common/tst-fmemopen2.c (do_test): Add a cast.
* stdio-common/printf-parsemb.c (__find_specmb): Likewise. * sysdeps/unix/sysv/linux/poll.c: Likewise.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | stdio-common/printf-parsemb.c | 5 | ||||
| -rw-r--r-- | stdio-common/tst-fmemopen2.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/poll.c | 5 |
4 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 1699975088..9e07a4063e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-01-08 Roland McGrath <roland@redhat.com> + * stdio-common/tst-fmemopen2.c (do_test): Add a cast. + * stdio-common/printf-parsemb.c (__find_specmb): Likewise. + * sysdeps/unix/sysv/linux/alpha/adjtime.c: Use <> instead of "" in #include for kernel-features.h. * sysdeps/unix/sysv/linux/alpha/dl-sysdep.c: Likewise. @@ -80,6 +83,7 @@ * sysdeps/unix/sysv/linux/msgctl.c: Likewise. * sysdeps/unix/sysv/linux/netlinkaccess.h: Likewise. * sysdeps/unix/sysv/linux/opendir.c: Likewise. + * sysdeps/unix/sysv/linux/poll.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fe_nomask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c: Likewise. diff --git a/stdio-common/printf-parsemb.c b/stdio-common/printf-parsemb.c index c55b97060c..2f21fc6365 100644 --- a/stdio-common/printf-parsemb.c +++ b/stdio-common/printf-parsemb.c @@ -1,5 +1,5 @@ /* Helper functions for parsing printf format strings. - Copyright (C) 1995-2000, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1995-2000,2002,2003,2004,2006 Free Software Foundation, Inc. This file is part of th GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -64,7 +64,8 @@ __find_specmb (const UCHAR_T *format, mbstate_t *ps) /* Remove any hints of a wrong encoding. */ ps->__count = 0; - if (! isascii (*format) && (len = __mbrlen (format, MB_CUR_MAX, ps)) > 0) + if (! isascii (*format) + && (len = __mbrlen ((const CHAR_T *) format, MB_CUR_MAX, ps)) > 0) format += len; else ++format; diff --git a/stdio-common/tst-fmemopen2.c b/stdio-common/tst-fmemopen2.c index bcb136e8c1..81beddddef 100644 --- a/stdio-common/tst-fmemopen2.c +++ b/stdio-common/tst-fmemopen2.c @@ -28,7 +28,7 @@ do_test (void) o = ftello (fp); if (o != 0) { - printf ("second ftello returned %ld, expected %zu\n", o, 0); + printf ("second ftello returned %ld, expected %zu\n", o, (off_t) 0); result = 1; } if (fseeko (fp, 0, SEEK_END) != 0) diff --git a/sysdeps/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c index 4c4868645b..a745fbcbc0 100644 --- a/sysdeps/unix/sysv/linux/poll.c +++ b/sysdeps/unix/sysv/linux/poll.c @@ -1,5 +1,6 @@ /* Poll system call, with emulation if it is not available. - Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc. + Copyright (C) 1997,1998,1999,2000,2001,2002,2006 + 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 @@ -24,7 +25,7 @@ #include <sys/syscall.h> #include <bp-checks.h> -#include "kernel-features.h" +#include <kernel-features.h> #if defined __NR_poll || __ASSUME_POLL_SYSCALL > 0 |