From 3ba06713f8c2c40f3bf0cc9431352ba873701dcd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 4 Aug 2002 20:54:20 +0000 Subject: Update. 2002-08-04 Jakub Jelinek * manual/debug.texi: Fix spelling to programmatically. Reported by . * include/libio.h: Add libc_hidden_proto for __uflow. * include/stdio.h: Map fopen, fdopen, fclose, fputs, fsetpos, and fgetpos to _IO_* names. Add libc_hidden_proto for fileno, fwrite, fseek, fflush_unlocked, fread_unlocked, fwrite_unlocked, fgets_unlocked, fputs_unlocked. * include/wchar.h: Add libc_hidden_proto for fputws_unlocked, putwc_unlocked, vswscanf. * libio/iolibio.h: Add libc_hidden_proto for _IO_fputs. * libio/fileno.c: Use and libc_hidden_def. * libio/fseek.c: Likewise. * libio/fmemopen.c: Include "libioP.h". Call _IO_fopencookie and not fopencookie. * libio/genops.c (__uflow): Add libc_hidden_def. * libio/iofflush_u.c (fflush_unlocked): Likewise. * libio/iofgets_u.c (fgets_unlocked): Likewise. * libio/iofputs_u.c (fputs_unlocked): Likewise. * libio/iofputws_u.c (fputws_unlocked): Likewise. * libio/iofread_u.c (fread_unlocked): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iovswscanf.c (vswscanf): Likewise. * libio/putwc_u.c (putwc_unlocked): Likewise. * libio/iofputs.c: Use libc_hidden_def instead of INTDEF. * malloc/malloc.c: Redirect fwrite calls to _IO_fwrite. * malloc/mtrace.c: Likewise. * sunrpc/clnt_perr.c: Remove fputs macro. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * iconv/Makefile: Add CPPFLAGS definitions with -DNOT_in_libc for iconv_prog, linereader, and charmap-dir. * locale/Makefile: Likewise for locale and charmap-dir. * malloc/Makefile: Likewise for memusagestat. * nscd/Makefile: Likewise for nscd, nscd_conf, and dbg_log. * sunrpc/Makefile: Likewise for rpc_main. * sysdeps/unix/sysv/linux/Makefile: Likewise for lddlibc4. * timezone/Makefile: Likewise for zic. * stdio-common/perror.c: Avoid multiple calls to fileno_unlocked. --- include/libio.h | 1 + include/stdio.h | 25 +++++++++++++++++++++++-- include/wchar.h | 5 +++++ 3 files changed, 29 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/libio.h b/include/libio.h index a3a6518876..ee727e262f 100644 --- a/include/libio.h +++ b/include/libio.h @@ -5,6 +5,7 @@ libc_hidden_proto (__overflow) libc_hidden_proto (__underflow) +libc_hidden_proto (__uflow) libc_hidden_proto (__woverflow) libc_hidden_proto (__wunderflow) libc_hidden_proto (__wuflow) diff --git a/include/stdio.h b/include/stdio.h index 4f144d3e78..e58c033709 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -62,9 +62,7 @@ extern void __funlockfile (FILE *__stream); extern int __ftrylockfile (FILE *__stream); extern int __getc_unlocked (FILE *__fp); -# ifdef USE_IN_LIBIO extern wint_t __getwc_unlocked (FILE *__fp); -# endif extern __const char *__const _sys_errlist_internal[] attribute_hidden; @@ -76,8 +74,31 @@ extern int __asprintf_internal (char **__restrict __ptr, # ifndef NOT_IN_libc # define __asprintf(ptr, fmt, args...) \ INTUSE(__asprintf) (ptr, fmt, ##args) + +extern _IO_FILE *_IO_new_fopen __P((const char*, const char*)); +# define fopen(fname, mode) _IO_new_fopen (fname, mode) +extern _IO_FILE *_IO_new_fdopen __P((int, const char*)); +# define fdopen(fd, mode) _IO_new_fdopen (fd, mode) +extern int _IO_new_fclose __P((_IO_FILE*)); +# define fclose(fp) _IO_new_fclose (fp) +extern int _IO_fputs __P((const char*, _IO_FILE*)); +libc_hidden_proto (_IO_fputs) +# define fputs(str, fp) _IO_fputs (str, fp) +extern int _IO_new_fsetpos __P ((_IO_FILE *, const _IO_fpos_t *)); +# define fsetpos(fp, posp) _IO_new_fsetpos (fp, posp) +extern int _IO_new_fgetpos __P ((_IO_FILE *, _IO_fpos_t *)); +# define fgetpos(fp, posp) _IO_new_fgetpos (fp, posp) # endif +libc_hidden_proto (fileno) +libc_hidden_proto (fwrite) +libc_hidden_proto (fseek) +libc_hidden_proto (fflush_unlocked) +libc_hidden_proto (fread_unlocked) +libc_hidden_proto (fwrite_unlocked) +libc_hidden_proto (fgets_unlocked) +libc_hidden_proto (fputs_unlocked) + # endif #endif diff --git a/include/wchar.h b/include/wchar.h index 8395392de6..cb63ed97a9 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -14,6 +14,11 @@ libc_hidden_proto (__wcstoull_internal) libc_hidden_proto (__wcscasecmp_l) libc_hidden_proto (__wcsncasecmp_l) +libc_hidden_proto (fputws_unlocked) +libc_hidden_proto (putwc_unlocked) + +libc_hidden_proto (vswscanf) + /* Now define the internal interfaces. */ extern int __wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) -- cgit 1.4.1