aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-21 04:18:25 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-21 04:18:25 +0000
commit4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c (patch)
tree046f117d02a6ce4b2dd47c26270592f9ce9be5e0 /libio
parenta785f6c56e7be1b07ee099ee3982e84d8b538ef4 (diff)
downloadglibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar.gz
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar.bz2
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.zip
Update.
* argp/argp-help.c: Unify use of function aliases to make more compact PLT. * include/libintl.h: Likewise. * inet/rcmd.c: Likewise. * intl/dcigettext.c: Likewise. * libio/iofputws.c: Likewise. * libio/iofputws_u.c: Likewise. * libio/iogetwline.c: Likewise. * libio/swprintf.c: Likewise. * malloc/malloc.c: Likewise. * nss/digits_dots.c: Likewise. * posix/fnmatch.c: Likewise. * posix/spawn_faction_addclose.c: Likewise. * posix/spawn_faction_adddup2.c: Likewise. * posix/spawn_faction_addopen.c: Likewise. * posix/spawni.c: Likewise. * posix/wordexp.c: Likewise. * posix/spawni.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_init.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sighold.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/printf-parse.h: Likewise. * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/rpmatch.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sysdeps/generic/setrlimit64.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/posix/posix_fallocate.c: Likewise. * sysdeps/posix/posix_fallocate64.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/sigset.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/bsd/ualarm.c: Likewise. * sysdeps/unix/sysv/linux/dl-origin.c: Likewise. * sysdeps/unix/sysv/linux/getloadavg.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * time/strftime.c: Likewise. * wcsmbs/wcscoll.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generate postinc/predec instruction.
Diffstat (limited to 'libio')
-rw-r--r--libio/iofputws.c4
-rw-r--r--libio/iofputws_u.c4
-rw-r--r--libio/iogetwline.c4
-rw-r--r--libio/swprintf.c4
4 files changed, 10 insertions, 6 deletions
diff --git a/libio/iofputws.c b/libio/iofputws.c
index daad1b9836..db8ce05897 100644
--- a/libio/iofputws.c
+++ b/libio/iofputws.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ fputws (str, fp)
const wchar_t *str;
_IO_FILE *fp;
{
- _IO_size_t len = wcslen (str);
+ _IO_size_t len = __wcslen (str);
int result = EOF;
CHECK_FILE (fp, EOF);
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
diff --git a/libio/iofputws_u.c b/libio/iofputws_u.c
index a5749cdbec..6219d96976 100644
--- a/libio/iofputws_u.c
+++ b/libio/iofputws_u.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ fputws_unlocked (str, fp)
const wchar_t *str;
_IO_FILE *fp;
{
- _IO_size_t len = wcslen (str);
+ _IO_size_t len = __wcslen (str);
int result = EOF;
CHECK_FILE (fp, EOF);
if (_IO_fwide (fp, 1) == 1
diff --git a/libio/iogetwline.c b/libio/iogetwline.c
index 760d54a013..2d9eca0edc 100644
--- a/libio/iogetwline.c
+++ b/libio/iogetwline.c
@@ -27,6 +27,10 @@
#include <string.h>
#include <wchar.h>
+#ifdef _LIBC
+# define wmemcpy __wmemcpy
+#endif
+
#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO
_IO_size_t
diff --git a/libio/swprintf.c b/libio/swprintf.c
index f0cb637b27..b5112e4e1c 100644
--- a/libio/swprintf.c
+++ b/libio/swprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1997,1998,1999,2000 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
@@ -31,7 +31,7 @@ swprintf (s, n, format)
int done;
va_start (arg, format);
- done = vswprintf (s, n, format, arg);
+ done = __vswprintf (s, n, format, arg);
va_end (arg);
return done;