diff options
47 files changed, 193 insertions, 139 deletions
diff --git a/ChangeLog b/ChangeLog index 4a2526866c..b137f794bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,57 @@ 2000-08-20 Ulrich Drepper <drepper@redhat.com> + * 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. + * time/tst-getdate.c (main): Make error messages more human readable. - * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generic - postinc/postdec instruction. + * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generate + postinc/predec instruction. (_FPU_SETCW): Likewise. Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>. diff --git a/argp/argp-help.c b/argp/argp-help.c index 560fe5237f..394a4add2f 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -1,5 +1,5 @@ /* Hierarchial argument parsing help output - Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu>. @@ -1521,7 +1521,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream, if (! stream) return; - flockfile (stream); + __flockfile (stream); if (! uparams.valid) fill_in_uparams (state); @@ -1529,7 +1529,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream, fs = __argp_make_fmtstream (stream, 0, uparams.rmargin, 0); if (! fs) { - funlockfile (stream); + __funlockfile (stream); return; } @@ -1637,7 +1637,7 @@ Try `%s --help' or `%s --usage' for more information.\n"), anything = 1; } - funlockfile (stream); + __funlockfile (stream); if (hol) hol_free (hol); @@ -1696,7 +1696,7 @@ __argp_error (const struct argp_state *state, const char *fmt, ...) { va_list ap; - flockfile (stream); + __flockfile (stream); fputs_unlocked (state ? state->name : program_invocation_short_name, stream); @@ -1711,7 +1711,7 @@ __argp_error (const struct argp_state *state, const char *fmt, ...) __argp_state_help (state, stream, ARGP_HELP_STD_ERR); - funlockfile (stream); + __funlockfile (stream); } } } @@ -1737,7 +1737,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum, if (stream) { - flockfile (stream); + __flockfile (stream); fputs_unlocked (state ? state->name : program_invocation_short_name, stream); @@ -1763,7 +1763,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum, putc_unlocked ('\n', stream); - funlockfile (stream); + __funlockfile (stream); if (status && (!state || !(state->flags & ARGP_NO_EXIT))) exit (status); diff --git a/include/libintl.h b/include/libintl.h index 2da639d40d..0f77658a0e 100644 --- a/include/libintl.h +++ b/include/libintl.h @@ -22,13 +22,7 @@ extern const char _libc_intl_domainname[]; # define N_(msgid) msgid # undef _ -# ifdef dgettext /* This is defined as an optimizing macro, so use it. */ -# define _(msgid) dgettext (_libc_intl_domainname, (msgid)) -# else -/* Be sure to use only the __ name when `dgettext' is a plain function - instead of an optimizing macro. */ -# define _(msgid) __dgettext (_libc_intl_domainname, (msgid)) -# endif +# define _(msgid) __dcgettext (_libc_intl_domainname, (msgid), LC_MESSAGES) #endif diff --git a/inet/rcmd.c b/inet/rcmd.c index 758f6c953b..6c01f96811 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -129,7 +129,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) hints.ai_flags = AI_CANONNAME; hints.ai_family = af; hints.ai_socktype = SOCK_STREAM; - (void)snprintf(num, sizeof(num), "%d", ntohs(rport)); + (void)__snprintf(num, sizeof(num), "%d", ntohs(rport)); error = getaddrinfo(*ahost, num, &hints, &res); if (error) { fprintf(stderr, "rcmd: getaddrinfo: %s\n", @@ -191,7 +191,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) continue; } if (refused && timo <= 16) { - (void)sleep(timo); + (void)__sleep(timo); timo *= 2; ai = res; refused = 0; @@ -327,7 +327,7 @@ rresvport_af(alport, family) __set_errno (EAFNOSUPPORT); return -1; } - s = socket(family, SOCK_STREAM, 0); + s = __socket(family, SOCK_STREAM, 0); if (s < 0) return -1; diff --git a/intl/dcigettext.c b/intl/dcigettext.c index fcbc130a26..c69bb19bc8 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -129,6 +129,7 @@ void free (); # ifndef stpcpy # define stpcpy __stpcpy # endif +# define tfind __tfind #else # if !defined HAVE_GETCWD char *getwd (); diff --git a/intl/plural.c b/intl/plural.c index 73716c4cd3..e34fb8ee52 100644 --- a/intl/plural.c +++ b/intl/plural.c @@ -39,16 +39,15 @@ #include "gettext.h" #include "gettextP.h" -#define YYDEBUG 1 #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg -#line 33 "plural.y" +#line 32 "plural.y" typedef union { unsigned long int num; struct expression *exp; } YYSTYPE; -#line 38 "plural.y" +#line 37 "plural.y" /* Prototypes for local functions. */ static struct expression *new_exp (enum operator op, int n, ...); @@ -118,8 +117,8 @@ static const short yyrhs[] = { 19, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 56, 62, 67, 72, 77, 82, 87, 92, 97, 102, - 107, 112, 117, 123 + 55, 61, 66, 71, 76, 81, 86, 91, 96, 101, + 106, 111, 116, 122 }; #endif @@ -735,90 +734,90 @@ yyreduce: switch (yyn) { case 1: -#line 57 "plural.y" +#line 56 "plural.y" { ((struct parse_args *) arg)->res = yyvsp[0].exp; ; break;} case 2: -#line 63 "plural.y" +#line 62 "plural.y" { if ((yyval.exp = new_exp (qmop, 3, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 3: -#line 68 "plural.y" +#line 67 "plural.y" { if ((yyval.exp = new_exp (lor, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 4: -#line 73 "plural.y" +#line 72 "plural.y" { if ((yyval.exp = new_exp (land, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 5: -#line 78 "plural.y" +#line 77 "plural.y" { if ((yyval.exp = new_exp (equal, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 6: -#line 83 "plural.y" +#line 82 "plural.y" { if ((yyval.exp = new_exp (not_equal, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 7: -#line 88 "plural.y" +#line 87 "plural.y" { if ((yyval.exp = new_exp (plus, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 8: -#line 93 "plural.y" +#line 92 "plural.y" { if ((yyval.exp = new_exp (minus, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 9: -#line 98 "plural.y" +#line 97 "plural.y" { if ((yyval.exp = new_exp (mult, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 10: -#line 103 "plural.y" +#line 102 "plural.y" { if ((yyval.exp = new_exp (divide, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 11: -#line 108 "plural.y" +#line 107 "plural.y" { if ((yyval.exp = new_exp (module, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 12: -#line 113 "plural.y" +#line 112 "plural.y" { if ((yyval.exp = new_exp (var, 0)) == NULL) YYABORT ; break;} case 13: -#line 118 "plural.y" +#line 117 "plural.y" { if ((yyval.exp = new_exp (num, 0)) == NULL) YYABORT; @@ -826,7 +825,7 @@ case 13: ; break;} case 14: -#line 124 "plural.y" +#line 123 "plural.y" { yyval.exp = yyvsp[-1].exp ; @@ -1053,7 +1052,7 @@ yyerrhandle: } return 1; } -#line 129 "plural.y" +#line 128 "plural.y" static struct expression * @@ -1134,8 +1133,6 @@ yylex (YYSTYPE *lval, const char **pexp) const char *exp = *pexp; int result; - yydebug = 1; - while (1) { if (exp[0] == '\\' && exp[1] == '\n') 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; diff --git a/malloc/malloc.c b/malloc/malloc.c index 9ae5b6ef24..6db66298bc 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -889,6 +889,7 @@ Void_t *(*__morecore)() = __default_morecore; static size_t __libc_pagesize; +#define access __access #define mmap __mmap #define munmap __munmap #define mremap __mremap diff --git a/nss/digits_dots.c b/nss/digits_dots.c index cfca343312..045bf8a661 100644 --- a/nss/digits_dots.c +++ b/nss/digits_dots.c @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef USE_NSCD +# define inet_aton __inet_aton +#endif + /* * disallow names consisting only of digits/dots, unless * they end in a dot. diff --git a/posix/fnmatch.c b/posix/fnmatch.c index b6f67ae0b3..1db39d9e0d 100644 --- a/posix/fnmatch.c +++ b/posix/fnmatch.c @@ -56,6 +56,8 @@ # include "../locale/elem-hash.h" # define CONCAT(a,b) __CONCAT(a,b) +# define mbsinit __mbsinit +# define mbsrtowcs __mbsrtowcs #endif /* Comment out all this code if we are using the GNU C Library, and are not diff --git a/posix/spawn_faction_addclose.c b/posix/spawn_faction_addclose.c index b90abb1f7a..b093f2812a 100644 --- a/posix/spawn_faction_addclose.c +++ b/posix/spawn_faction_addclose.c @@ -28,7 +28,7 @@ int posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *file_actions, int fd) { - int maxfd = sysconf (_SC_OPEN_MAX); + int maxfd = __sysconf (_SC_OPEN_MAX); struct __spawn_action *rec; /* Test for the validity of the file descriptor. */ diff --git a/posix/spawn_faction_adddup2.c b/posix/spawn_faction_adddup2.c index 7407cca531..f8de8ca7f6 100644 --- a/posix/spawn_faction_adddup2.c +++ b/posix/spawn_faction_adddup2.c @@ -28,7 +28,7 @@ int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions, int fd, int newfd) { - int maxfd = sysconf (_SC_OPEN_MAX); + int maxfd = __sysconf (_SC_OPEN_MAX); struct __spawn_action *rec; /* Test for the validity of the file descriptor. */ diff --git a/posix/spawn_faction_addopen.c b/posix/spawn_faction_addopen.c index b177f07294..3e0c62659e 100644 --- a/posix/spawn_faction_addopen.c +++ b/posix/spawn_faction_addopen.c @@ -29,7 +29,7 @@ posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions, int fd, const char *path, int oflag, mode_t mode) { - int maxfd = sysconf (_SC_OPEN_MAX); + int maxfd = __sysconf (_SC_OPEN_MAX); struct __spawn_action *rec; /* Test for the validity of the file descriptor. */ diff --git a/posix/spawni.c b/posix/spawni.c index 9f10c930f3..1fa97a0eea 100644 --- a/posix/spawni.c +++ b/posix/spawni.c @@ -77,7 +77,7 @@ __spawni (pid_t *pid, const char *file, short int flags; /* Generate the new process. */ - new_pid = fork (); + new_pid = __fork (); if (new_pid != 0) { if (new_pid < 0) @@ -157,16 +157,16 @@ __spawni (pid_t *pid, const char *file, switch (action->tag) { case spawn_do_close: - if (close (action->action.close_action.fd) != 0) + if (__close (action->action.close_action.fd) != 0) /* Signal the error. */ _exit (SPAWN_ERROR); break; case spawn_do_open: { - int new_fd = open (action->action.open_action.path, - action->action.open_action.oflag, - action->action.open_action.mode); + int new_fd = __open (action->action.open_action.path, + action->action.open_action.oflag, + action->action.open_action.mode); if (new_fd == -1) /* The `open' call failed. */ @@ -180,7 +180,7 @@ __spawni (pid_t *pid, const char *file, /* The `dup2' call failed. */ _exit (SPAWN_ERROR); - if (close (new_fd) != 0) + if (__close (new_fd) != 0) /* The `close' call failed. */ _exit (SPAWN_ERROR); } diff --git a/posix/wordexp.c b/posix/wordexp.c index fd6ce113b2..739df218fb 100644 --- a/posix/wordexp.c +++ b/posix/wordexp.c @@ -1,5 +1,5 @@ /* POSIX.2 wordexp implementation. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>. @@ -851,7 +851,7 @@ exec_comm_child (char *comm, int *fildes, int showerr, int noexec) } /* Make sure the subshell doesn't field-split on our behalf. */ - unsetenv ("IFS"); + __unsetenv ("IFS"); __close (fildes[0]); __execve (_PATH_BSHELL, (char *const *) args, __environ); @@ -1069,7 +1069,7 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length, fildes[0] = fildes[1] = -1; exec_comm_child(comm, fildes, 0, 1); } - + if (__waitpid (pid, &status, 0) == pid && status != 0) return WRDE_SYNTAX; } @@ -1847,7 +1847,7 @@ envsubst: if (pattern && !value) goto no_space; - setenv (env, value, 1); + __setenv (env, value, 1); break; default: diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index 59da9d6753..33c00d95b0 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 95, 96, 97, 98, 99 Free Software Foundation, Inc. +/* Copyright (C) 1993, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Contributed by David Mosberger (davidm@azstarnet.com). The GNU C Library is free software; you can redistribute it and/or @@ -278,7 +278,7 @@ parse_line (const char *fname, int line_num, const char *str) for (i = 0; i < sizeof (cmd) / sizeof (cmd[0]); ++i) { - if (strncasecmp (start, cmd[i].name, len) == 0 + if (__strncasecmp (start, cmd[i].name, len) == 0 && strlen (cmd[i].name) == len) { c = &cmd[i]; @@ -414,7 +414,7 @@ _res_hconf_reorder_addrs (struct hostent *hp) /* Only reorder if we're supposed to. */ if ((_res_hconf.flags & HCONF_FLAG_REORDER) == 0) return; - + /* Can't deal with anything but IPv4 for now... */ if (hp->h_addrtype != AF_INET) return; @@ -425,7 +425,7 @@ _res_hconf_reorder_addrs (struct hostent *hp) int sd, num, i; /* Save errno. */ int save = errno; - + /* Initialize interface table. */ num_ifs = 0; @@ -445,13 +445,13 @@ _res_hconf_reorder_addrs (struct hostent *hp) ifaddrs = malloc (num * sizeof (ifaddrs[0])); if (!ifaddrs) goto cleanup1; - + /* Copy usable interfaces in ifaddrs structure. */ for (cur_ifr = ifr, i = 0; i < num; ++cur_ifr, ++i) { if (cur_ifr->ifr_addr.sa_family != AF_INET) continue; - + ifaddrs[num_ifs].addrtype = AF_INET; ifaddrs[num_ifs].u.ipv4.addr = ((struct sockaddr_in *) &cur_ifr->ifr_addr)->sin_addr.s_addr; @@ -475,7 +475,7 @@ _res_hconf_reorder_addrs (struct hostent *hp) /* Release lock, preserve error value, and close socket. */ save = errno; __libc_lock_unlock (lock); - close (sd); + __close (sd); } if (num_ifs == 0) diff --git a/resolv/res_init.c b/resolv/res_init.c index b6e63d225c..e0ea6edc3a 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1985, 1989, 1993 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,7 +13,7 @@ * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -29,14 +29,14 @@ /* * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -117,7 +117,7 @@ static u_int32_t net_mask __P((struct in_addr)); * since it was noted that INADDR_ANY actually meant ``the first interface * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface, * it had to be "up" in order for you to reach your own name server. It - * was later decided that since the recommended practice is to always + * was later decided that since the recommended practice is to always * install local static routes through 127.0.0.1 for all your network * interfaces, that we could solve this problem without a code change. * @@ -294,7 +294,8 @@ __res_vinit(res_state statp, int preinit) { cp = buf + sizeof("nameserver") - 1; while (*cp == ' ' || *cp == '\t') cp++; - if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) { + if ((*cp != '\0') && (*cp != '\n') + && __inet_aton(cp, &a)) { statp->nsaddr_list[nserv].sin_addr = a; statp->nsaddr_list[nserv].sin_family = AF_INET; statp->nsaddr_list[nserv].sin_port = @@ -343,7 +344,7 @@ __res_vinit(res_state statp, int preinit) { cp++; n = *cp; *cp = 0; - if (inet_aton(net, &a)) { + if (__inet_aton(net, &a)) { statp->sort_list[nsort].addr = a; if (ISSORTMASK(n)) { *cp++ = n; @@ -353,14 +354,14 @@ __res_vinit(res_state statp, int preinit) { cp++; n = *cp; *cp = 0; - if (inet_aton(net, &a)) { + if (__inet_aton(net, &a)) { statp->sort_list[nsort].mask = a.s_addr; } else { - statp->sort_list[nsort].mask = + statp->sort_list[nsort].mask = net_mask(statp->sort_list[nsort].addr); } } else { - statp->sort_list[nsort].mask = + statp->sort_list[nsort].mask = net_mask(statp->sort_list[nsort].addr); } nsort++; @@ -375,7 +376,7 @@ __res_vinit(res_state statp, int preinit) { continue; } } - if (nserv > 1) + if (nserv > 1) statp->nscount = nserv; #ifdef _LIBC if (nservall - nserv > 0) @@ -526,8 +527,8 @@ void res_nclose(res_state statp) { int ns; - if (statp->_vcsock >= 0) { - (void) close(statp->_vcsock); + if (statp->_vcsock >= 0) { + (void) __close(statp->_vcsock); statp->_vcsock = -1; statp->_flags &= ~(RES_F_VC | RES_F_CONN); } @@ -539,7 +540,7 @@ res_nclose(res_state statp) { #endif { if (statp->_u._ext.nssocks[ns] != -1) { - (void) close(statp->_u._ext.nssocks[ns]); + (void) __close(statp->_u._ext.nssocks[ns]); statp->_u._ext.nssocks[ns] = -1; } } diff --git a/shadow/lckpwdf.c b/shadow/lckpwdf.c index 4f4ff28e54..454d65b268 100644 --- a/shadow/lckpwdf.c +++ b/shadow/lckpwdf.c @@ -131,7 +131,7 @@ __lckpwdf (void) /* Now make sure the alarm signal is not blocked. */ sigemptyset (&new_set); - sigaddset (&new_set, SIGALRM); + __sigaddset (&new_set, SIGALRM); if (__sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0) RETURN_RESTORE_HANDLER (-1); diff --git a/signal/sighold.c b/signal/sighold.c index 730bcacb72..30ca7d551b 100644 --- a/signal/sighold.c +++ b/signal/sighold.c @@ -1,5 +1,5 @@ /* Add SIG to the calling process' signal mask. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -33,7 +33,7 @@ sighold (sig) return -1; /* Add the specified signal. */ - if (sigaddset (&set, sig) < 0) + if (__sigaddset (&set, sig) < 0) return -1; /* Set the new mask. */ diff --git a/signal/sigrelse.c b/signal/sigrelse.c index 56bafaa906..3ad7da26bd 100644 --- a/signal/sigrelse.c +++ b/signal/sigrelse.c @@ -1,5 +1,5 @@ /* Remove SIG from the calling process' signal mask. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -33,7 +33,7 @@ sigrelse (sig) return -1; /* Remove the specified signal. */ - if (sigdelset (&set, sig) < 0) + if (__sigdelset (&set, sig) < 0) return -1; /* Set the new mask. */ diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h index 45bcc3a9bb..1f2878a5fc 100644 --- a/stdio-common/printf-parse.h +++ b/stdio-common/printf-parse.h @@ -106,7 +106,7 @@ find_spec (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 (format, MB_CUR_MAX, ps)) > 0) format += len; else ++format; diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c index 19869cad19..c41b60e997 100644 --- a/stdio-common/printf-prs.c +++ b/stdio-common/printf-prs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995, 1996, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1995,1996,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 @@ -30,7 +30,7 @@ # define L_(Str) Str # define ISDIGIT(Ch) isdigit (Ch) # define ISASCII(Ch) isascii (Ch) -# define MBRLEN(Cp, L, St) mbrlen (Cp, L, St) +# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St) # ifdef USE_IN_LIBIO # define PUT(F, S, N) _IO_sputn (F, S, N) diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index 47052d7797..557a02224b 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -1186,8 +1186,8 @@ group_number (wchar_t *buf, wchar_t *bufend, unsigned int intdig_no, return bufend; /* Move the fractional part down. */ - wmemmove (buf + intdig_no + ngroups, buf + intdig_no, - bufend - (buf + intdig_no)); + __wmemmove (buf + intdig_no + ngroups, buf + intdig_no, + bufend - (buf + intdig_no)); p = buf + intdig_no + ngroups - 1; do diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index 216ab291fa..3f13026e14 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -969,9 +969,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) if (!left) \ PAD (L' '); \ if (fspec == NULL) \ - outchar (btowc ((unsigned char) va_arg (ap, int))); /* Promoted. */ \ + outchar (__btowc ((unsigned char) va_arg (ap, int))); /* Promoted. */ \ else \ - outchar (btowc ((unsigned char) args_value[fspec->data_arg].pa_char));\ + outchar (__btowc ((unsigned char) \ + args_value[fspec->data_arg].pa_char)); \ if (left) \ PAD (L' '); \ break; \ diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index d618851a89..0731c5656e 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -80,7 +80,7 @@ : ((c = _IO_getwc_unlocked (s)), \ (void) (c != WEOF && ++read_in), c)) -# define MEMCPY(d, s, n) wmemcpy (d, s, n) +# define MEMCPY(d, s, n) __wmemcpy (d, s, n) # define ISSPACE(Ch) iswspace (Ch) # define ISDIGIT(Ch) iswdigit (Ch) # define ISXDIGIT(Ch) iswxdigit (Ch) @@ -696,7 +696,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) { size_t n; - n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state); + n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state); if (n == (size_t) -1) /* No valid wide character. */ input_error (); @@ -883,7 +883,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr) } } - n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state); + n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, + &state); if (n == (size_t) -1) encode_error (); @@ -939,7 +940,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) /* We have to emit the code to get into the intial state. */ char buf[MB_LEN_MAX]; - size_t n = wcrtomb (buf, L'\0', &state); + size_t n = __wcrtomb (buf, L'\0', &state); if (n > 0 && (flags & MALLOC) && str + n >= *strptr + strsize) { @@ -2251,7 +2252,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) } } - n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state); + n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state); if (n == (size_t) -1) encode_error (); @@ -2324,7 +2325,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) /* We have to emit the code to get into the intial state. */ char buf[MB_LEN_MAX]; - size_t n = wcrtomb (buf, L'\0', &state); + size_t n = __wcrtomb (buf, L'\0', &state); if (n > 0 && (flags & MALLOC) && str + n >= *strptr + strsize) { diff --git a/stdlib/rpmatch.c b/stdlib/rpmatch.c index 7475a7769c..31fd471944 100644 --- a/stdlib/rpmatch.c +++ b/stdlib/rpmatch.c @@ -1,7 +1,7 @@ /* Determine whether string value is affirmation or negative response according to current locale's data. This file is part of the GNU C Library. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -39,17 +39,17 @@ rpmatch (response) if (*lastp) { /* Free the old compiled pattern. */ - regfree (re); + __regfree (re); *lastp = NULL; } /* Compile the pattern and cache it for future runs. */ - if (regcomp (re, pattern, REG_EXTENDED) != 0) + if (__regcomp (re, pattern, REG_EXTENDED) != 0) return -1; *lastp = pattern; } /* Try the pattern. */ - return regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch; + return __regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch; } /* We cache the response patterns and compiled regexps here. */ diff --git a/sunrpc/create_xid.c b/sunrpc/create_xid.c index 15fb367bca..218b704913 100644 --- a/sunrpc/create_xid.c +++ b/sunrpc/create_xid.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998 Free Software Foundation, Inc. +/* Copyright (c) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998. @@ -41,7 +41,7 @@ _create_xid (void) struct timeval now; __gettimeofday (&now, (struct timezone *) 0); - srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data); + __srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data); is_initialized = 1; } diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index 895e5a3a4d..6e9d4a3cb4 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -398,7 +398,7 @@ getkeyserv_handle (int vers) { /* if other side closed socket, build handle again */ clnt_control (kcp->client, CLGET_FD, (char *)&fd); - if (getpeername (fd,(struct sockaddr *)&name,&namelen) == -1) + if (__getpeername (fd,(struct sockaddr *)&name,&namelen) == -1) { auth_destroy (kcp->client->cl_auth); clnt_destroy (kcp->client); diff --git a/sysdeps/generic/setrlimit64.c b/sysdeps/generic/setrlimit64.c index 1e55de3e26..d1dca5999e 100644 --- a/sysdeps/generic/setrlimit64.c +++ b/sysdeps/generic/setrlimit64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,1998,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 @@ -39,5 +39,5 @@ setrlimit64 (resource, rlimits) else rlimits32.rlim_max = rlimits->rlim_max; - return setrlimit (resource, &rlimits32); + return __setrlimit (resource, &rlimits32); } diff --git a/sysdeps/generic/utmp_file.c b/sysdeps/generic/utmp_file.c index 74e91fb948..2f172ffdbe 100644 --- a/sysdeps/generic/utmp_file.c +++ b/sysdeps/generic/utmp_file.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com> and Paul Janzen <pcj@primenet.com>, 1996. @@ -133,7 +133,7 @@ setutent_file (void) result = __fcntl (file_fd, F_SETFD, result | FD_CLOEXEC); if (result == -1) { - close (file_fd); + __close (file_fd); return 0; } } diff --git a/sysdeps/generic/vlimit.c b/sysdeps/generic/vlimit.c index 68addbce7a..47871bc6c4 100644 --- a/sysdeps/generic/vlimit.c +++ b/sysdeps/generic/vlimit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 1997, 1998, 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 @@ -43,7 +43,7 @@ vlimit (resource, value) return -1; lims.rlim_cur = value; - return setrlimit (rlimit_res, &lims); + return __setrlimit (rlimit_res, &lims); } __set_errno (EINVAL); diff --git a/sysdeps/posix/posix_fallocate.c b/sysdeps/posix/posix_fallocate.c index cd0f96113e..46ce06f10d 100644 --- a/sysdeps/posix/posix_fallocate.c +++ b/sysdeps/posix/posix_fallocate.c @@ -61,7 +61,7 @@ posix_fallocate (int fd, __off_t offset, size_t len) { len -= step; - if (pwrite (fd, "", 1, offset) != 1) + if (__pwrite (fd, "", 1, offset) != 1) return errno; offset += step; diff --git a/sysdeps/posix/posix_fallocate64.c b/sysdeps/posix/posix_fallocate64.c index 539244de58..4be48e77f9 100644 --- a/sysdeps/posix/posix_fallocate64.c +++ b/sysdeps/posix/posix_fallocate64.c @@ -61,7 +61,7 @@ posix_fallocate64 (int fd, __off64_t offset, size_t len) { len -= step; - if (pwrite64 (fd, "", 1, offset) != 1) + if (__pwrite64 (fd, "", 1, offset) != 1) return errno; offset += step; diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c index 793ec89a51..4832c6a4a5 100644 --- a/sysdeps/posix/sigpause.c +++ b/sysdeps/posix/sigpause.c @@ -35,7 +35,7 @@ __sigpause (sig_or_mask, is_sig) /* The modern X/Open implementation is requested. */ if (__sigprocmask (0, NULL, &set) < 0 /* Yes, we call `sigdelset' and not `__sigdelset'. */ - || sigdelset (&set, sig_or_mask) < 0) + || __sigdelset (&set, sig_or_mask) < 0) return -1; } else diff --git a/sysdeps/posix/sigset.c b/sysdeps/posix/sigset.c index e234d8a52d..4fea94f2cd 100644 --- a/sysdeps/posix/sigset.c +++ b/sysdeps/posix/sigset.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 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 @@ -40,7 +40,7 @@ sigset (sig, disp) return SIG_ERR; /* Add the specified signal. */ - if (sigaddset (&set, sig) < 0) + if (__sigaddset (&set, sig) < 0) return SIG_ERR; /* Add the signal set to the current signal mask. */ @@ -70,7 +70,7 @@ sigset (sig, disp) return SIG_ERR; /* Add the specified signal. */ - if (sigaddset (&set, sig) < 0) + if (__sigaddset (&set, sig) < 0) return SIG_ERR; /* Remove the signal set from the current signal mask. */ diff --git a/sysdeps/unix/bsd/ualarm.c b/sysdeps/unix/bsd/ualarm.c index 5fd4d79a9d..b280f5b062 100644 --- a/sysdeps/unix/bsd/ualarm.c +++ b/sysdeps/unix/bsd/ualarm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 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 @@ -36,7 +36,7 @@ ualarm (value, interval) timer.it_interval.tv_sec = 0; timer.it_interval.tv_usec = interval; - if (setitimer (ITIMER_REAL, &timer, &otimer) < 0) + if (__setitimer (ITIMER_REAL, &timer, &otimer) < 0) return -1; return (otimer.it_value.tv_sec * 1000000) + otimer.it_value.tv_usec; diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c index df155eb23e..1ac542f609 100644 --- a/sysdeps/unix/grantpt.c +++ b/sysdeps/unix/grantpt.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998. @@ -48,7 +48,7 @@ pts_name (int fd, char **pts, size_t buf_len) if (buf_len) { - rv = ptsname_r (fd, buf, buf_len); + rv = __ptsname_r (fd, buf, buf_len); if (rv != 0 || memchr (buf, '\0', buf_len)) /* We either got an error, or we succeeded and the @@ -126,7 +126,7 @@ grantpt (int fd) Try a moderate value. */ grbuflen = 1024; grtmpbuf = (char *) __alloca (grbuflen); - getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p); + __getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p); gid = p ? p->gr_gid : __getgid (); /* Make sure the group of the device is that special group. */ @@ -157,7 +157,7 @@ grantpt (int fd) { /* Disable core dumps. */ struct rlimit rl = { 0, 0 }; - setrlimit (RLIMIT_CORE, &rl); + __setrlimit (RLIMIT_CORE, &rl); /* We pase the master pseudo terminal as file descriptor PTY_FILENO. */ if (fd != PTY_FILENO) diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c index e425467eba..6ee0ed2bf4 100644 --- a/sysdeps/unix/sysv/linux/dl-origin.c +++ b/sysdeps/unix/sysv/linux/dl-origin.c @@ -37,7 +37,7 @@ _dl_get_origin (void) char linkval[PATH_MAX]; char *result; - if (readlink ("/proc/self/exe", linkval, PATH_MAX) != -1 + if (__readlink ("/proc/self/exe", linkval, PATH_MAX) != -1 && linkval[0] != '[') { /* We can use this value. */ diff --git a/sysdeps/unix/sysv/linux/getloadavg.c b/sysdeps/unix/sysv/linux/getloadavg.c index 1612ad2e56..909920e6f7 100644 --- a/sysdeps/unix/sysv/linux/getloadavg.c +++ b/sysdeps/unix/sysv/linux/getloadavg.c @@ -1,5 +1,5 @@ /* Get system load averages. Linux (/proc/loadavg) version. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 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 @@ -42,7 +42,7 @@ getloadavg (double loadavg[], int nelem) int i; nread = __read (fd, buf, sizeof buf - 1); - close (fd); + __close (fd); if (nread < 0) return -1; buf[nread - 1] = '\0'; diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c index 0973925cca..81149ff390 100644 --- a/sysdeps/unix/sysv/linux/ttyname.c +++ b/sysdeps/unix/sysv/linux/ttyname.c @@ -47,14 +47,14 @@ getttyname (const char *dev, dev_t mydev, ino_t myino, int save, int *dostat) struct dirent *d; size_t devlen = strlen (dev) + 1; - dirstream = opendir (dev); + dirstream = __opendir (dev); if (dirstream == NULL) { *dostat = -1; return NULL; } - while ((d = readdir (dirstream)) != NULL) + while ((d = __readdir (dirstream)) != NULL) if (((ino_t) d->d_fileno == myino || *dostat) && strcmp (d->d_name, "stdin") && strcmp (d->d_name, "stdout") diff --git a/sysdeps/unix/sysv/linux/ulimit.c b/sysdeps/unix/sysv/linux/ulimit.c index ec0337428d..dc0ba7209b 100644 --- a/sysdeps/unix/sysv/linux/ulimit.c +++ b/sysdeps/unix/sysv/linux/ulimit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,94,95,96,97,98,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 @@ -58,7 +58,7 @@ __ulimit (int cmd, ...) limit.rlim_cur = newlimit * 512; limit.rlim_max = newlimit * 512; - result = setrlimit (RLIMIT_FSIZE, &limit); + result = __setrlimit (RLIMIT_FSIZE, &limit); } break; diff --git a/time/strftime.c b/time/strftime.c index 7771880e75..c8334d95fb 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -92,8 +92,8 @@ extern char *tzname[]; # define L_(Str) L##Str # define NLW(Sym) _NL_W##Sym -# define MEMCPY(d, s, n) wmemcpy (d, s, n) -# define STRLEN(s) wcslen (s) +# define MEMCPY(d, s, n) __wmemcpy (d, s, n) +# define STRLEN(s) __wcslen (s) #else # define CHAR_T char @@ -834,7 +834,7 @@ my_strftime (s, maxsize, format, tp ut_argument) if (era) { # ifdef COMPILE_WIDE - size_t len = wcslen (era->era_wname); + size_t len = __wcslen (era->era_wname); cpy (len, era->era_wname); # else size_t len = strlen (era->era_name); diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c index 1dfe93918b..6fbd13df72 100644 --- a/wcsmbs/wcscoll.c +++ b/wcsmbs/wcscoll.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -27,7 +27,7 @@ # define STRCOLL wcscoll #endif #define STRCMP wcscmp -#define STRLEN wcslen +#define STRLEN __wcslen #define WEIGHT_H "../locale/weightwc.h" #define SUFFIX WC #define L(arg) L##arg diff --git a/wcsmbs/wcsxfrm.c b/wcsmbs/wcsxfrm.c index c515657244..d4ac1338d9 100644 --- a/wcsmbs/wcsxfrm.c +++ b/wcsmbs/wcsxfrm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -27,7 +27,7 @@ # define STRXFRM wcsxfrm #endif #define STRCMP wcscmp -#define STRLEN wcslen +#define STRLEN __wcslen #define STPNCPY __wcpncpy #define WEIGHT_H "../locale/weightwc.h" #define SUFFIX WC |