1998-09-07 07:45:24 +08:00
|
|
|
#ifndef _LIBINTL_H
|
1995-11-11 04:38:31 +08:00
|
|
|
#include <intl/libintl.h>
|
2000-08-29 07:52:21 +08:00
|
|
|
#include <locale.h>
|
1998-08-10 01:39:48 +08:00
|
|
|
|
|
|
|
|
/* Now define the internal interfaces. */
|
2002-05-02 00:41:24 +08:00
|
|
|
extern char *__gettext (__const char *__msgid)
|
|
|
|
|
__attribute_format_arg__ (1);
|
1999-10-19 21:53:34 +08:00
|
|
|
extern char *__dgettext (__const char *__domainname,
|
2002-05-02 00:41:24 +08:00
|
|
|
__const char *__msgid)
|
|
|
|
|
__attribute_format_arg__ (2);
|
1999-10-19 21:53:34 +08:00
|
|
|
extern char *__dcgettext (__const char *__domainname,
|
2002-05-02 00:41:24 +08:00
|
|
|
__const char *__msgid, int __category)
|
|
|
|
|
__attribute_format_arg__ (2);
|
2005-06-14 23:55:44 +08:00
|
|
|
libc_hidden_proto (__dcgettext)
|
2002-04-08 16:59:00 +08:00
|
|
|
extern char *__dcgettext_internal (__const char *__domainname,
|
|
|
|
|
__const char *__msgid, int __category)
|
2002-05-02 00:41:24 +08:00
|
|
|
__attribute_format_arg__ (2)
|
2002-04-08 16:59:00 +08:00
|
|
|
attribute_hidden;
|
2002-05-02 00:41:24 +08:00
|
|
|
|
|
|
|
|
extern char *__ngettext (__const char *__msgid1, __const char *__msgid2,
|
|
|
|
|
unsigned long int __n)
|
|
|
|
|
__attribute_format_arg__ (1) __attribute_format_arg__ (2);
|
|
|
|
|
extern char *__dngettext (__const char *__domainname,
|
|
|
|
|
__const char *__msgid1, __const char *__msgid2,
|
|
|
|
|
unsigned long int __n)
|
|
|
|
|
__attribute_format_arg__ (2) __attribute_format_arg__ (3);
|
|
|
|
|
extern char *__dcngettext (__const char *__domainname,
|
|
|
|
|
__const char *__msgid1, __const char *__msgid2,
|
|
|
|
|
unsigned long int __n, int __category)
|
|
|
|
|
__attribute_format_arg__ (2) __attribute_format_arg__ (3);
|
|
|
|
|
extern char *__dcngettext_internal (__const char *__domainname,
|
|
|
|
|
__const char *__msgid1,
|
|
|
|
|
__const char *__msgid2,
|
|
|
|
|
unsigned long int __n, int __category)
|
|
|
|
|
__attribute_format_arg__ (2) __attribute_format_arg__ (3)
|
|
|
|
|
attribute_hidden;
|
|
|
|
|
|
1999-11-24 01:22:17 +08:00
|
|
|
extern char *__textdomain (__const char *__domainname);
|
1999-10-19 21:53:34 +08:00
|
|
|
extern char *__bindtextdomain (__const char *__domainname,
|
1999-11-24 01:22:17 +08:00
|
|
|
__const char *__dirname);
|
2000-05-08 23:57:36 +08:00
|
|
|
extern char *__bind_textdomain_codeset (__const char *__domainname,
|
|
|
|
|
__const char *__codeset);
|
2002-05-02 00:41:24 +08:00
|
|
|
|
1999-06-19 17:58:37 +08:00
|
|
|
extern const char _libc_intl_domainname[];
|
[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 09:19:55 +08:00
|
|
|
libc_hidden_proto (_libc_intl_domainname)
|
1999-06-19 17:58:37 +08:00
|
|
|
|
|
|
|
|
/* Define the macros `_' and `N_' for conveniently marking translatable
|
1999-07-24 07:10:36 +08:00
|
|
|
strings in the libc source code. We have to make sure we get the
|
|
|
|
|
correct definitions so we undefine the macros first. */
|
1999-06-19 17:58:37 +08:00
|
|
|
|
1999-07-24 07:10:36 +08:00
|
|
|
# undef N_
|
1999-06-19 17:58:37 +08:00
|
|
|
# define N_(msgid) msgid
|
|
|
|
|
|
1999-07-24 07:10:36 +08:00
|
|
|
# undef _
|
1999-06-19 17:58:37 +08:00
|
|
|
/* This is defined as an optimizing macro, so use it. */
|
[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 09:19:55 +08:00
|
|
|
# define _(msgid) \
|
2002-04-18 16:08:23 +08:00
|
|
|
__dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
|
1999-06-19 17:58:37 +08:00
|
|
|
|
1998-09-07 07:45:24 +08:00
|
|
|
#endif
|
