mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
17c389fc2b
* libio/stdio.h: Make fseeko and ftello prototypes available is __USE_LARGEFILE. Patch by Paul Eggert <eggert@twinsun.com>. * sysdeps/generic/dl-environ.c (unsetenv): Follow change to the real unsetenv implementation from 1999-07-29 [PR libc/1714]. 2000-05-03 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (dcigettext): Do the defaulting of 'domainname' before calling tfind. 2000-03-05 Jakub Jelinek <jakub@redhat.com> * resolv/resolv.h (res_querydomain): Remove redefinition to __res_querydomain (reported by Owen Taylor <otaylor@redhat.com>). 2000-05-03 Ulrich Drepper <drepper@redhat.com> * po/gl.po: Update from translation team. * manual/intro.texi (Program Basics): Change section title. * manual/process.texi: Fix reference. (Executing a File): Add reference exec in other section. * manual/signal.texi: Fix reference. * manual/startup.texi: Document syscall function. Patches by Bryan Henderson <bryanh@giraffe-data.com>. 2000-04-29 Bruno Haible <haible@clisp.cons.org> * intl/libintl.h (bind_textdomain_codeset): New declaration. * intl/bindtextdom.c (set_binding_values): New function. (bindtextdomain): Call it. (bind_textdomain_codeset): New function. * intl/dcigettext.c (dcigettext): Pass binding to _nl_find_domain. (free_mem): Free each binding's codeset. * intl/gettextP.h (struct binding): Add codeset field. (_nl_find_domain): Add domainbinding argument. * intl/finddomain.c (_nl_find_domain): Add domainbinding argument. Pass it to _nl_make_l10nflist. * intl/loadinfo.h (struct loaded_l10nfile): Add domainbinding field. (_nl_make_l10nflist): Add domainbinding argument. * intl/l10nflist.c (_nl_make_l10nflist): Add domainbinding argument. * intl/loadmsgcat.c (_nl_load_domain): Look at the domainbinding's codeset when determining outcharset. If !_LIBC && HAVE_ICONV, call locale_charset(). * manual/message.texi: New node "Charset conversion in gettext". 2000-04-30 Bruno Haible <haible@clisp.cons.org> * catgets/open_catalog.c (__open_catalog): Use __builtin_expect where appropriate. Handle possible __read error. 2000-04-29 Bruno Haible <haible@clisp.cons.org> * intl/gettextP.h (__builtin_expect): Define as empty if not a compiler builtin. * intl/loadinfo.h (__builtin_expect): Likewise. * intl/dcigettext.c (dcigettext, _nl_find_msg): Use __builtin_expect where appropriate. * intl/loadmsgcat.c (_nl_load_domain): Likewise. * intl/localealias.c (extend_alias_table): Return an error indicator. (read_alias_file): Bail out if extend_alias_table fails. 2000-04-29 Bruno Haible <haible@clisp.cons.org> * intl/loadmsgcat.c: Define _GNU_SOURCE as early as possible. * intl/localealias.c: Likewise. 2000-05-01 Bruno Haible <haible@clisp.cons.org> * intl/loadmsgcat.c (_nl_load_domain): Initialize domain->conv_tab. Initialize domain->plural and domain->nplurals even if there is no nullentry. 2000-05-01 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (_nl_find_msg): Terminate __gconv loop if return value is == __GCONV_OK or == __GCONV_EMPTY_INPUT, not != __GCONV_OK. In case of failure, goto converted. 2000-05-01 Bruno Haible <haible@clisp.cons.org> * wcsmbs/wcsmbsload.c (norm_add_slashes): Move away. * iconv/gconv_int.h (norm_add_slashes): Move to here. * intl/loadmsgcat.c (_nl_load_domain): Normalize strings passed to __gconv_open. 2000-04-29 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (transcmp): Compare the domains as well. (dcigettext): Call strlen (msgid1) after testing msgid1 against NULL, not before. * intl/loadmsgcat.c (_nl_load_domain): Deal with EINTR. Include <errno.h>. 2000-05-03 Ulrich Drepper <drepper@redhat.com>
116 lines
4.1 KiB
C
116 lines
4.1 KiB
C
/* Message catalogs for internationalization.
|
|
Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
|
|
This file is derived from the file libgettext.h in the GNU gettext package.
|
|
|
|
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
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C 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 the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifndef _LIBINTL_H
|
|
#define _LIBINTL_H 1
|
|
|
|
#include <features.h>
|
|
|
|
/* We define an additional symbol to signal that we use the GNU
|
|
implementation of gettext. */
|
|
#define __USE_GNU_GETTEXT 1
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Look up MSGID in the current default message catalog for the current
|
|
LC_MESSAGES locale. If not found, returns MSGID itself (the default
|
|
text). */
|
|
extern char *gettext (__const char *__msgid) __THROW;
|
|
|
|
/* Look up MSGID in the DOMAINNAME message catalog for the current
|
|
LC_MESSAGES locale. */
|
|
extern char *dgettext (__const char *__domainname,
|
|
__const char *__msgid) __THROW;
|
|
extern char *__dgettext (__const char *__domainname,
|
|
__const char *__msgid) __THROW;
|
|
|
|
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
|
|
locale. */
|
|
extern char *dcgettext (__const char *__domainname,
|
|
__const char *__msgid, int __category) __THROW;
|
|
extern char *__dcgettext (__const char *__domainname,
|
|
__const char *__msgid, int __category) __THROW;
|
|
|
|
|
|
/* Similar to `gettext' but select the plural form corresponding to the
|
|
number N. */
|
|
extern char *ngettext (__const char *__msgid1, __const char *__msgid2,
|
|
unsigned long int __n)
|
|
__THROW __attribute__ ((__format_arg__ (1)));
|
|
|
|
/* Similar to `dgettext' but select the plural form corresponding to the
|
|
number N. */
|
|
extern char *dngettext (__const char *__domainname, __const char *__msgid1,
|
|
__const char *__msgid2, unsigned long int __n)
|
|
__THROW __attribute__ ((__format_arg__ (2)));
|
|
|
|
/* Similar to `dcgettext' but select the plural form corresponding to the
|
|
number N. */
|
|
extern char *dcngettext (__const char *__domainname, __const char *__msgid1,
|
|
__const char *__msgid2, unsigned long int __n,
|
|
int __category)
|
|
__THROW __attribute__ ((__format_arg__ (2)));
|
|
|
|
|
|
/* Set the current default message catalog to DOMAINNAME.
|
|
If DOMAINNAME is null, return the current default.
|
|
If DOMAINNAME is "", reset to the default of "messages". */
|
|
extern char *textdomain (__const char *__domainname) __THROW;
|
|
|
|
/* Specify that the DOMAINNAME message catalog will be found
|
|
in DIRNAME rather than in the system locale data base. */
|
|
extern char *bindtextdomain (__const char *__domainname,
|
|
__const char *__dirname) __THROW;
|
|
|
|
/* Specify the character encoding in which the messages from the
|
|
DOMAINNAME message catalog will be returned. */
|
|
extern char *bind_textdomain_codeset (__const char *__domainname,
|
|
__const char *__codeset) __THROW;
|
|
|
|
|
|
/* Optimized version of the function above. */
|
|
#if defined __OPTIMIZE__
|
|
|
|
/* We need NULL for `gettext'. */
|
|
# define __need_NULL
|
|
# include <stddef.h>
|
|
|
|
/* We need LC_MESSAGES for `dgettext'. */
|
|
# include <locale.h>
|
|
|
|
/* These must be macros. Inlined functions are useless because the
|
|
`__builtin_constant_p' predicate in dcgettext would always return
|
|
false. */
|
|
|
|
# define gettext(msgid) dgettext (NULL, msgid)
|
|
|
|
# define dgettext(domainname, msgid) \
|
|
dcgettext (domainname, msgid, LC_MESSAGES)
|
|
|
|
# define ngettext(msgid, n) dngettext (NULL, msgid, n)
|
|
|
|
# define dngettext(domainname, msgid, n) \
|
|
dcngettext (domainname, msgid, n, LC_MESSAGES)
|
|
|
|
#endif /* Optimizing. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* libintl.h */
|