From 6293b80374f7c7b017515b9a8716a9ea16eb063a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 17 Aug 2001 07:51:36 +0000 Subject: Update. 2001-08-17 Ulrich Drepper * sunrpc/svc_simple.c (universal): Use __write instead of write. * wcsmbs/wcscoll.c: Also define __wcscoll. * include/wchar.h: Declare __wcscoll. * libio/fwprintf.c: Use __vfwprintf instead of vfwprintf. * libio/vwprintf.c: Likewise. * libio/wprintf.c: Likewise. * iconv/gconv_cache.c: Use __munmap instead of munmap. * posix/regex.c [_LIBC] (convert_mbs_to_wcs): Use __mbrtowc instead of mbrtowc. [_LIBC]: Use __iswctype instead of iswctype, __wcslen instead of wcslen, and __wcscoll instead of wcscoll. * sysdeps/unix/sockatmark.c (sockatmark): Use __ioctl instead of ioctl. * sysdeps/unix/sysv/linux/gai_sigqueue.c (__gai_sigqueue): Use __getuid instead of getuid. * stdio-common/perror.c (perror): Use __close instead of close. * iconv/gconv_cache.c (__gconv_load_cache): Likewise. * libio/freopen.c (freopen): Likewise. * libio/freopen64.c (freopen64): Likewise. --- libio/freopen.c | 4 ++-- libio/freopen64.c | 4 ++-- libio/fwprintf.c | 2 +- libio/vwprintf.c | 4 ++-- libio/wprintf.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libio') diff --git a/libio/freopen.c b/libio/freopen.c index 584b6e033d..a38313c334 100644 --- a/libio/freopen.c +++ b/libio/freopen.c @@ -47,7 +47,7 @@ freopen (filename, mode, fp) _IO_flockfile (fp); if (filename == NULL && _IO_fileno (fp) >= 0) { - fd = dup (_IO_fileno (fp)); + fd = __dup (_IO_fileno (fp)); if (fd != -1) filename = fd_to_filename (fd); } @@ -67,7 +67,7 @@ freopen (filename, mode, fp) result->_mode = 0; if (fd != -1) { - close (fd); + __close (fd); if (filename != NULL) free ((char *) filename); } diff --git a/libio/freopen64.c b/libio/freopen64.c index 28cfb79df7..941eda0aa9 100644 --- a/libio/freopen64.c +++ b/libio/freopen64.c @@ -47,7 +47,7 @@ freopen64 (filename, mode, fp) _IO_flockfile (fp); if (filename == NULL && _IO_fileno (fp) >= 0) { - fd = dup (_IO_fileno (fp)); + fd = __dup (_IO_fileno (fp)); if (fd != -1) filename = fd_to_filename (fd); } @@ -57,7 +57,7 @@ freopen64 (filename, mode, fp) result->_mode = 0; if (fd != -1) { - close (fd); + __close (fd); if (filename != NULL) free ((char *) filename); } diff --git a/libio/fwprintf.c b/libio/fwprintf.c index 6f30bc1f55..cadeda04ab 100644 --- a/libio/fwprintf.c +++ b/libio/fwprintf.c @@ -30,7 +30,7 @@ __fwprintf (FILE *stream, const wchar_t *format, ...) int done; va_start (arg, format); - done = vfwprintf (stream, format, arg); + done = __vfwprintf (stream, format, arg); va_end (arg); return done; diff --git a/libio/vwprintf.c b/libio/vwprintf.c index cfb03c0b26..814fdf32bf 100644 --- a/libio/vwprintf.c +++ b/libio/vwprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,1993,1995,1997,1999,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 @@ -27,5 +27,5 @@ vwprintf (format, arg) const wchar_t *format; __gnuc_va_list arg; { - return vfwprintf (stdout, format, arg); + return __vfwprintf (stdout, format, arg); } diff --git a/libio/wprintf.c b/libio/wprintf.c index 42bb412b23..f418cf515d 100644 --- a/libio/wprintf.c +++ b/libio/wprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,1999,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 @@ -29,7 +29,7 @@ wprintf (const wchar_t *format, ...) int done; va_start (arg, format); - done = vfwprintf (stdout, format, arg); + done = __vfwprintf (stdout, format, arg); va_end (arg); return done; -- cgit v1.2.3