diff options
| author | Roland McGrath <roland@gnu.org> | 2002-12-11 22:59:29 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-12-11 22:59:29 +0000 |
| commit | 0f1316460cae46817ae843d0bba15c259d77d0e6 (patch) | |
| tree | 8c95e9bd3a241314fc28006101879fd5bb51fc24 /intl/plural-exp.h | |
| parent | 5cb5cfa2a26007b9a4a1c89d791cb5a0493bf7cd (diff) | |
* intl/gettext.h: Renamed to ...
* intl/gmo.h: ... here.
* intl/Makefile (distribute): Add gmo.h, remove gettext.h.
* intl/gettextP.h: Update.
* intl/loadmsgcat.c: Update.
* intl/gettextP.h (PARAMS): Make more portable.
(attribute_hidden): Define as empty macro if not already defined.
* intl/hash-string.h (PARAMS): Make more portable.
* intl/loadinfo.h (PARAMS): Likewise.
* intl/plural-exp.h (PARAMS): Likewise.
(attribute_hidden): Move definition near the definition of
internal_function.
* intl/gettextP.h (_nl_locale_name) [!_LIBC]: New declaration.
* intl/plural-exp.h (plural_eval) [!_LIBC]: New declaration.
2002-07-13 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (freea): New macro.
(FREE_BLOCKS): Free also the registered blocks.
(DCIGETTEXT): Free the 'search' variable.
Reported by Andreas Fischer <a.fischer@asentics.de>.
2002-04-27 Bruno Haible <bruno@clisp.org>
* intl/gettextP.h [! _LIBC]: Use prefix libintl_ instead of suffix __.
* intl/dcigettext.c: Likewise.
* intl/dcgettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/gettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/bindtextdom.c: Likewise.
* intl/plural-exp.h: Likewise.
2002-01-02 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Use PARAMS in extern decl.
2001-04-30 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (getuid, getgid, geteuid, getegid): Provide
default macro definitions. Needed for mingw32.
Diffstat (limited to 'intl/plural-exp.h')
| -rw-r--r-- | intl/plural-exp.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/intl/plural-exp.h b/intl/plural-exp.h index 25b7c8b8aa..75c702f79c 100644 --- a/intl/plural-exp.h +++ b/intl/plural-exp.h @@ -22,7 +22,7 @@ #define _PLURAL_EXP_H #ifndef PARAMS -# if __STDC__ +# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES # define PARAMS(args) args # else # define PARAMS(args) () @@ -33,6 +33,10 @@ # define internal_function #endif +#ifndef attribute_hidden +# define attribute_hidden +#endif + /* This is the representation of the expressions to determine the plural form. */ @@ -95,10 +99,10 @@ struct parse_args # define GERMANIC_PLURAL __gettext_germanic_plural # define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural #elif defined (IN_LIBINTL) -# define FREE_EXPRESSION gettext_free_exp__ -# define PLURAL_PARSE gettextparse__ -# define GERMANIC_PLURAL gettext_germanic_plural__ -# define EXTRACT_PLURAL_EXPRESSION gettext_extract_plural__ +# define FREE_EXPRESSION libintl_gettext_free_exp +# define PLURAL_PARSE libintl_gettextparse +# define GERMANIC_PLURAL libintl_gettext_germanic_plural +# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural #else # define FREE_EXPRESSION free_plural_expression # define PLURAL_PARSE parse_plural_expression @@ -106,10 +110,6 @@ struct parse_args # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression #endif -#ifndef attribute_hidden -# define attribute_hidden -#endif - extern void FREE_EXPRESSION PARAMS ((struct expression *exp)) internal_function; extern int PLURAL_PARSE PARAMS ((void *arg)); @@ -119,4 +119,9 @@ extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry, unsigned long int *npluralsp)) internal_function; +#if !defined (_LIBC) && !defined (IN_LIBINTL) +extern unsigned long int plural_eval PARAMS ((struct expression *pexp, + unsigned long int n)); +#endif + #endif /* _PLURAL_EXP_H */ |