diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-01-06 22:07:28 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-01-06 22:07:28 +0000 |
| commit | df4ef2ab9c0899b2670067cd97e58f7eb2913e00 (patch) | |
| tree | 4cb343b5ba9ccdc9c0b96144412567b6a4eda0ee /intl | |
| parent | 6f9e7002f38ae778b3ff2f586a3e5766382228e9 (diff) | |
| download | glibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.zip glibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.tar.gz glibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.tar.bz2 | |
update from main archive 960105cvs/libc-970107cvs/libc-970106
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/finddomain.c | 32 | ||||
| -rw-r--r-- | intl/locale.alias | 9 |
2 files changed, 6 insertions, 35 deletions
diff --git a/intl/finddomain.c b/intl/finddomain.c index ad03a45..9b531c4 100644 --- a/intl/finddomain.c +++ b/intl/finddomain.c @@ -1,5 +1,5 @@ /* finddomain.c -- handle list of needed message catalogs - Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. This file is part of the GNU C Library. Its master source is NOT part of @@ -63,18 +63,6 @@ void free (); #endif /* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# define stpcpy(dest, src) __stpcpy(dest, src) -#else -# ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -# endif -#endif - /* List of already loaded domains. */ static struct loaded_l10nfile *_nl_loaded_domains; @@ -200,21 +188,3 @@ _nl_find_domain (dirname, locale, domainname) return retval; } - -/* @@ begin of epilog @@ */ - -/* We don't want libintl.a to depend on any other library. So we - avoid the non-standard function stpcpy. In GNU C Library this - function is available, though. Also allow the symbol HAVE_STPCPY - to be defined. */ -#if !_LIBC && !HAVE_STPCPY -static char * -stpcpy (dest, src) - char *dest; - const char *src; -{ - while ((*dest++ = *src++) != '\0') - /* Do nothing. */ ; - return dest - 1; -} -#endif diff --git a/intl/locale.alias b/intl/locale.alias index 99ce5d1..e685298 100644 --- a/intl/locale.alias +++ b/intl/locale.alias @@ -1,5 +1,5 @@ -# Locale name alias data base -# Copyright (C) 1996 Free Software Foundation, Inc. +# Locale name alias data base. +# Copyright (C) 1996, 1997 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,8 +22,9 @@ # All entries are case independent. # Note: This file is far from being complete. If you have a value for -# your own site which you think might be useful for others too, share it -# with the rest of us. Send it to bug-gnu-utils@prep.ai.mit.edu. +# your own site which you think might be useful for others too, share +# it with the rest of us. Send it using the `glibcbug' script to +# bugs@gnu.ai.mit.edu. czech cs_CZ.ISO-8859-2 danish da_DK.ISO-8859-1 |