diff options
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/getline.c | 1 | ||||
| -rw-r--r-- | stdio-common/reg-printf.c | 3 | ||||
| -rw-r--r-- | stdio-common/scanf.c | 1 | ||||
| -rw-r--r-- | stdio-common/tmpnam.c | 2 | ||||
| -rw-r--r-- | stdio-common/tstgetln.c | 6 | ||||
| -rw-r--r-- | stdio-common/vfprintf.c | 1 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 1 |
7 files changed, 11 insertions, 4 deletions
diff --git a/stdio-common/getline.c b/stdio-common/getline.c index 7e78547c90..518398e055 100644 --- a/stdio-common/getline.c +++ b/stdio-common/getline.c @@ -23,6 +23,7 @@ Cambridge, MA 02139, USA. */ #ifdef USE_IN_LIBIO # include "../libio/libioP.h" +# undef ssize_t # define ssize_t _IO_ssize_t # define __getdelim _IO_getdelim #endif diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c index 2cb086dedf..519eec20ac 100644 --- a/stdio-common/reg-printf.c +++ b/stdio-common/reg-printf.c @@ -26,6 +26,9 @@ printf_arginfo_function *__printf_arginfo_table[UCHAR_MAX + 1]; printf_function **__printf_function_table; +int __register_printf_function __P ((int, printf_function, + printf_arginfo_function)); + /* Register FUNC to be called to format SPEC specifiers. */ int __register_printf_function (spec, converter, arginfo) diff --git a/stdio-common/scanf.c b/stdio-common/scanf.c index 8e9b90f3e7..29c9efb1c3 100644 --- a/stdio-common/scanf.c +++ b/stdio-common/scanf.c @@ -23,6 +23,7 @@ Cambridge, MA 02139, USA. */ use the protected form here. In stdio it is called `__vscanf' and in libio `_IO_vscanf'. */ #ifdef USE_IN_LIBIO +# include <libioP.h> # define VSCANF _IO_vscanf #else # define VSCANF __vscanf diff --git a/stdio-common/tmpnam.c b/stdio-common/tmpnam.c index 44397bc3f2..0f2199ea60 100644 --- a/stdio-common/tmpnam.c +++ b/stdio-common/tmpnam.c @@ -29,7 +29,7 @@ tmpnam (char *s) /* By using two buffers we manage to be thread safe in the case where S != NULL. */ static char buf[L_tmpnam]; - char *tmpbuf[L_tmpnam]; + char tmpbuf[L_tmpnam]; char *result; /* In the following call we use the buffer pointed to by S if diff --git a/stdio-common/tstgetln.c b/stdio-common/tstgetln.c index a35be272e9..a76317e069 100644 --- a/stdio-common/tstgetln.c +++ b/stdio-common/tstgetln.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995, 1996 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 @@ -16,15 +16,15 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> #include <stdio.h> #ifdef USE_IN_LIBIO +# undef ssize_t # define ssize_t _IO_ssize_t #endif int -DEFUN_VOID(main) +main () { char *buf = NULL; size_t size = 0; diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index f47eaa2850..7714c0e67f 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -87,6 +87,7 @@ ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n)); # define PUTC(C, F) _IO_putc_unlocked (C, F) # define vfprintf _IO_vfprintf # define FILE _IO_FILE +# undef va_list # define va_list _IO_va_list # undef BUFSIZ # define BUFSIZ _IO_BUFSIZ diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index ee2c922f6e..5564e2b0e6 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -51,6 +51,7 @@ Cambridge, MA 02139, USA. */ # include <libioP.h> # include <libio.h> +# undef va_list # define va_list _IO_va_list # define ungetc(c, s) (--read_in, _IO_ungetc (c, s)) # define inchar() ((c = _IO_getc_unlocked (s)), (void) ++read_in, c) |