diff options
Diffstat (limited to 'libintl/intl.c')
| -rw-r--r-- | libintl/intl.c | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/libintl/intl.c b/libintl/intl.c index 51765a99e..e42a999cb 100644 --- a/libintl/intl.c +++ b/libintl/intl.c @@ -1,18 +1,7 @@ -/* Copyright (C) 2003 Manuel Novoa III +/* Copyright (C) 2003 Manuel Novoa III + * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ /* @@ -41,26 +30,22 @@ char *gettext(const char *msgid) /**********************************************************************/ #ifdef L_dgettext -char *__dgettext(const char *domainname, +char *dgettext(const char *domainname, const char *msgid) { return (char *) msgid; } -strong_alias(__dgettext, dgettext) - #endif /**********************************************************************/ #ifdef L_dcgettext -char *__dcgettext(const char *domainname, +char *dcgettext(const char *domainname, const char *msgid, int category) { return (char *) msgid; } -strong_alias(__dcgettext, dcgettext) - #endif /**********************************************************************/ #ifdef L_ngettext @@ -96,7 +81,7 @@ char *dcngettext(const char *domainname, const char *msgid1, /**********************************************************************/ #ifdef L_textdomain -char *__textdomain(const char *domainname) +char *textdomain(const char *domainname) { static const char default_str[] = "messages"; @@ -107,13 +92,11 @@ char *__textdomain(const char *domainname) return (char *) default_str; } -strong_alias(__textdomain, textdomain) - #endif /**********************************************************************/ #ifdef L_bindtextdomain -char *__bindtextdomain(const char *domainname, const char *dirname) +char *bindtextdomain(const char *domainname, const char *dirname) { static const char dir[] = "/"; @@ -133,16 +116,13 @@ char *__bindtextdomain(const char *domainname, const char *dirname) return (char *) dir; } -strong_alias(__bindtextdomain, bindtextdomain) - #endif /**********************************************************************/ #ifdef L_bind_textdomain_codeset /* Specify the character encoding in which the messages from the DOMAINNAME message catalog will be returned. */ -char *bind_textdomain_codeset(const char *domainname, - const char *codeset) +char *bind_textdomain_codeset(const char *domainname, const char *codeset) { if (!domainname || !*domainname || codeset) { __set_errno(EINVAL); @@ -156,6 +136,7 @@ char *bind_textdomain_codeset(const char *domainname, /* glibc-ism */ +const char *_nl_expand_alias(const char * name); const char *_nl_expand_alias(const char * name) { return NULL; /* uClibc does not support locale aliases. */ |