From 86f4222cfe1e30c2de6c7362e31a8ab5b68f7321 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Wed, 19 May 2010 20:58:20 +0200 Subject: localization updates --- intl/libgnuintl.h.in | 97 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 69 insertions(+), 28 deletions(-) (limited to 'intl/libgnuintl.h.in') diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in index c9da7983..c991bf05 100644 --- a/intl/libgnuintl.h.in +++ b/intl/libgnuintl.h.in @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -17,9 +17,12 @@ USA. */ #ifndef _LIBINTL_H -#define _LIBINTL_H 1 +#define _LIBINTL_H 1 #include +#if (defined __APPLE__ && defined __MACH__) && @HAVE_NEWLOCALE@ +# include +#endif /* The LC_MESSAGES locale category is the category used by the functions gettext() and dgettext(). It is specified in POSIX, but not in ANSI C. @@ -53,7 +56,7 @@ extern "C" { /* Version number: (major<<16) + (minor<<8) + subminor */ -#define LIBINTL_VERSION 0x001100 +#define LIBINTL_VERSION 0x001200 extern int libintl_version; @@ -88,7 +91,7 @@ extern int libintl_version; If he doesn't, we choose the method. A third possible method is _INTL_REDIRECT_ASM, supported only by GCC. */ #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS) -# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) +# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) # define _INTL_REDIRECT_ASM # else # ifdef __cplusplus @@ -110,7 +113,7 @@ extern int libintl_version; /* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return its n-th argument literally. This enables GCC to warn for example about printf (gettext ("foo %y")). */ -#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus) +#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus) # define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n))) #else # define _INTL_MAY_RETURN_STRING_ARG(n) @@ -157,10 +160,10 @@ extern char *dgettext (const char *__domainname, const char *__msgid) locale. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_dcgettext (const char *__domainname, const char *__msgid, - int __category) + int __category) _INTL_MAY_RETURN_STRING_ARG (2); static inline char *dcgettext (const char *__domainname, const char *__msgid, - int __category) + int __category) { return libintl_dcgettext (__domainname, __msgid, __category); } @@ -169,7 +172,7 @@ static inline char *dcgettext (const char *__domainname, const char *__msgid, # define dcgettext libintl_dcgettext #endif extern char *dcgettext (const char *__domainname, const char *__msgid, - int __category) + int __category) _INTL_ASM (libintl_dcgettext) _INTL_MAY_RETURN_STRING_ARG (2); #endif @@ -179,10 +182,10 @@ extern char *dcgettext (const char *__domainname, const char *__msgid, number N. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2, - unsigned long int __n) + unsigned long int __n) _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2); static inline char *ngettext (const char *__msgid1, const char *__msgid2, - unsigned long int __n) + unsigned long int __n) { return libintl_ngettext (__msgid1, __msgid2, __n); } @@ -191,7 +194,7 @@ static inline char *ngettext (const char *__msgid1, const char *__msgid2, # define ngettext libintl_ngettext #endif extern char *ngettext (const char *__msgid1, const char *__msgid2, - unsigned long int __n) + unsigned long int __n) _INTL_ASM (libintl_ngettext) _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2); #endif @@ -200,10 +203,10 @@ extern char *ngettext (const char *__msgid1, const char *__msgid2, number N. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_dngettext (const char *__domainname, const char *__msgid1, - const char *__msgid2, unsigned long int __n) + const char *__msgid2, unsigned long int __n) _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); static inline char *dngettext (const char *__domainname, const char *__msgid1, - const char *__msgid2, unsigned long int __n) + const char *__msgid2, unsigned long int __n) { return libintl_dngettext (__domainname, __msgid1, __msgid2, __n); } @@ -212,8 +215,8 @@ static inline char *dngettext (const char *__domainname, const char *__msgid1, # define dngettext libintl_dngettext #endif extern char *dngettext (const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n) + const char *__msgid1, const char *__msgid2, + unsigned long int __n) _INTL_ASM (libintl_dngettext) _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); #endif @@ -222,12 +225,12 @@ extern char *dngettext (const char *__domainname, number N. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_dcngettext (const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category) + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category) _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); static inline char *dcngettext (const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category) + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category) { return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category); } @@ -236,8 +239,8 @@ static inline char *dcngettext (const char *__domainname, # define dcngettext libintl_dcngettext #endif extern char *dcngettext (const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category) + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category) _INTL_ASM (libintl_dcngettext) _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); #endif @@ -266,9 +269,9 @@ extern char *textdomain (const char *__domainname) in DIRNAME rather than in the system locale data base. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_bindtextdomain (const char *__domainname, - const char *__dirname); + const char *__dirname); static inline char *bindtextdomain (const char *__domainname, - const char *__dirname) + const char *__dirname) { return libintl_bindtextdomain (__domainname, __dirname); } @@ -284,9 +287,9 @@ extern char *bindtextdomain (const char *__domainname, const char *__dirname) DOMAINNAME message catalog will be returned. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_bind_textdomain_codeset (const char *__domainname, - const char *__codeset); + const char *__codeset); static inline char *bind_textdomain_codeset (const char *__domainname, - const char *__codeset) + const char *__codeset) { return libintl_bind_textdomain_codeset (__domainname, __codeset); } @@ -295,7 +298,7 @@ static inline char *bind_textdomain_codeset (const char *__domainname, # define bind_textdomain_codeset libintl_bind_textdomain_codeset #endif extern char *bind_textdomain_codeset (const char *__domainname, - const char *__codeset) + const char *__codeset) _INTL_ASM (libintl_bind_textdomain_codeset); #endif @@ -316,19 +319,24 @@ extern char *bind_textdomain_codeset (const char *__domainname, #include /* Get va_list. */ -#if __STDC__ || defined __cplusplus || defined _MSC_VER +#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER # include #else # include #endif +#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef fprintf #define fprintf libintl_fprintf extern int fprintf (FILE *, const char *, ...); +#endif +#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef vfprintf #define vfprintf libintl_vfprintf extern int vfprintf (FILE *, const char *, va_list); +#endif +#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */ #undef printf #if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ /* Don't break __attribute__((format(printf,M,N))). @@ -338,36 +346,51 @@ extern int vfprintf (FILE *, const char *, va_list); #endif #define printf libintl_printf extern int printf (const char *, ...); +#endif +#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef vprintf #define vprintf libintl_vprintf extern int vprintf (const char *, va_list); +#endif +#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef sprintf #define sprintf libintl_sprintf extern int sprintf (char *, const char *, ...); +#endif +#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef vsprintf #define vsprintf libintl_vsprintf extern int vsprintf (char *, const char *, va_list); +#endif #if @HAVE_SNPRINTF@ +#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef snprintf #define snprintf libintl_snprintf extern int snprintf (char *, size_t, const char *, ...); +#endif +#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef vsnprintf #define vsnprintf libintl_vsnprintf extern int vsnprintf (char *, size_t, const char *, va_list); +#endif #endif #if @HAVE_ASPRINTF@ +#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef asprintf #define asprintf libintl_asprintf extern int asprintf (char **, const char *, ...); +#endif +#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */ #undef vasprintf #define vasprintf libintl_vasprintf extern int vasprintf (char **, const char *, va_list); +#endif #endif @@ -399,6 +422,24 @@ extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list); #endif +/* Support for the locale chosen by the user. */ +#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ + +#undef setlocale +#define setlocale libintl_setlocale +extern char *setlocale (int, const char *); + +#if @HAVE_NEWLOCALE@ + +#undef newlocale +#define newlocale libintl_newlocale +extern locale_t newlocale (int, const char *, locale_t); + +#endif + +#endif + + /* Support for relocatable packages. */ /* Sets the original and the current installation prefix of the package. @@ -409,7 +450,7 @@ extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list); #define libintl_set_relocation_prefix libintl_set_relocation_prefix extern void libintl_set_relocation_prefix (const char *orig_prefix, - const char *curr_prefix); + const char *curr_prefix); #ifdef __cplusplus -- cgit v1.2.3