036cc82fbc
* intl/libintl.h: Define optimizing macros if __OPTIMIZE__ is defined, not __OPTIMIZED. (_nl_msg_cat_cntr): Move declaration outside macro definition to prevent "nested extern" warning. (dcgettext): Rename local variable `result' to `__result'. Thu Jul 25 22:46:30 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * locale/programs/localedef.c (__progname): Remove decl. (main): Use program_invocation_short_name instead of __progname. (usage): Use program_invocation_name instead of __progname. Fri Jul 26 03:46:08 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c: Use "libc" instead of PACKAGE. * locale/localedef.c: Ditto. * locale/locale.c: Ditto. * locale/findlocale.c (_nl_find_locale): Little optimization. Use new function `strndup'. * locale/loadlocale.c: Little optimization. Use constant value from `_nl_category_num_items' instead of byte-order dependend value from file. * locale/programs/ld-time.c (time_add): Correct string constant. * locale/programs/locale-spec.c: New file. * locale/programs/locale.c: Call `locale_special' function if no other field matches. * locale/programs/localedef.c: No need to define `program_name'. Use global variable `__progname'. * locale/programs/locfile.c (write_locale_data): Always write LC_MESSAGES data in LC_MESSAGES/SYS_LC_MESSAGES file. This is necessary since message catalogs are also installed in the LC_MESSAGES/ directory. * locale/programs/stringtrans.c (ADDC): Correctly use `encode_char' function instead of writing single bytes. (encode_char): Also handle little endian. * locale/setlocale.c (new_composite_name): Little optimization. Use return value of `memcpy'. * misc/ttyent.h: Pretty print prototypes, add missing parameter names, prepend parameter names with __ and use `__const' instead of `const'. * posix/unistd.h: Ditto. * stdlib/stdlib.h: Ditto. * string/string.h: Ditto. * posix/getconf.c: De-ASNI-fy. Recognize POSIX.2 constant names. Use `error' function instead of doing it by hand. * sysdeps/posix/sysconf.c: De-ANSI-fy. Handle _SC_COLL_WEIGHTS_MAX. * sysdeps/stub/sysconf.c: Handle _SC_CHARCLASS_NAME_MAX, _SC_COLL_WEIGHTS_MAX, _SC_EQUIV_CLASS_MAX, _SC_2_LOCALEDEF since these do depend on the platform. Add POSIX.4 symbols. * posix/posix2_lim.h: Add missing definition of _POSIX2_COLL_WEIGHTS_MAX. Change _POSIX2_EQUIV_CLASS_MAX and _POSIX2_CHARCLASS_NAME_MAX to high values since we have no fixed limit. * sysdeps/generic/confname.h: Add _SC_PAGE_SIZE as alias for _SC_PAGESIZE for buggy systems (= HP UX) out there. * wcsmbs/Makefile (routines): Add mbsnrtowcs and wcsnrtombs. * wcsmbs/mbsnrtowcs.c: New file. Non-standard implementation. * wcsmbs/wcsnrtombs.c: Ditto. * wcsmbs/wchar.h [__USE_GNU]: Add prototypes for mbsnrtowcs and wcsnrtombs. Thu Jul 25 00:25:54 Richard Henderson <rth@tamu.edu> * nss/nss_db/db-XXX.c: Kill trailing ; from lock defn as a matter of course. * nss/getXXent_r.c: Likewise. * nss/nsswitch.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * sysdeps/mach/hurd/dirstream.h (struct __dirstream): Likewise. * sysdeps/unix/bsd/telldir.c (struct record): Likewise. * sysdeps/unix/dirstream.h (struct __dirstream): Likewise.
121 lines
4.3 KiB
C
121 lines
4.3 KiB
C
/* libintl.h -- Message catalogs for internationalization.
|
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
|
This file is derived from the file libgettext.h in the GNU gettext package.
|
|
|
|
This file is part of the GNU C Library. Its master source is NOT part of
|
|
the C library, however. The master source lives in /gd/gnu/lib.
|
|
|
|
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., 675 Mass Ave,
|
|
Cambridge, MA 02139, 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 __P ((__const char *__msgid));
|
|
extern char *__gettext __P ((__const char *__msgid));
|
|
|
|
/* Look up MSGID in the DOMAINNAME message catalog for the current
|
|
LC_MESSAGES locale. */
|
|
extern char *dgettext __P ((__const char *__domainname,
|
|
__const char *__msgid));
|
|
extern char *__dgettext __P ((__const char *__domainname,
|
|
__const char *__msgid));
|
|
|
|
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
|
|
locale. */
|
|
extern char *dcgettext __P ((__const char *__domainname,
|
|
__const char *__msgid, int __category));
|
|
extern char *__dcgettext __P ((__const char *__domainname,
|
|
__const char *__msgid, int __category));
|
|
|
|
|
|
/* 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 __P ((__const char *__domainname));
|
|
extern char *__textdomain __P ((__const char *__domainname));
|
|
|
|
/* Specify that the DOMAINNAME message catalog will be found
|
|
in DIRNAME rather than in the system locale data base. */
|
|
extern char *bindtextdomain __P ((__const char *__domainname,
|
|
__const char *__dirname));
|
|
extern char *__bindtextdomain __P ((__const char *__domainname,
|
|
__const char *__dirname));
|
|
|
|
|
|
/* 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)
|
|
|
|
# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
|
|
/* Variable defined in loadmsgcat.c which gets incremented every time a
|
|
new catalog is loaded. */
|
|
extern int _nl_msg_cat_cntr;
|
|
|
|
# define dcgettext(domainname, msgid, category) \
|
|
(__extension__ \
|
|
({ \
|
|
char *__result; \
|
|
if (__builtin_constant_p (msgid)) \
|
|
{ \
|
|
static char *__translation__; \
|
|
static int __catalog_counter__; \
|
|
if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \
|
|
{ \
|
|
__translation__ = \
|
|
__dcgettext ((domainname), (msgid), (category)); \
|
|
__catalog_counter__ = _nl_msg_cat_cntr; \
|
|
} \
|
|
__result = __translation__; \
|
|
} \
|
|
else \
|
|
__result = __dcgettext ((domainname), (msgid), (category)); \
|
|
__result; \
|
|
}))
|
|
# endif
|
|
#endif /* Optimizing. */
|
|
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* libintl.h */
|