diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-11-29 13:17:48 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-21 23:28:20 +0200 |
| commit | 46e510e8532ef3f902244838ea50e4ef7621cf10 (patch) | |
| tree | 1c31e1572c839b394f85efc078000f4dd9e910e0 /intl | |
| parent | 3c203aa7b8b6fb4f0126d2a2e24c667aca58ee85 (diff) | |
| download | external_gettext-46e510e8532ef3f902244838ea50e4ef7621cf10.zip external_gettext-46e510e8532ef3f902244838ea50e4ef7621cf10.tar.gz external_gettext-46e510e8532ef3f902244838ea50e4ef7621cf10.tar.bz2 | |
Merge with glibc: rename germanic_plural.
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/ChangeLog | 6 | ||||
| -rw-r--r-- | intl/loadmsgcat.c | 2 | ||||
| -rw-r--r-- | intl/plural-exp.c | 14 | ||||
| -rw-r--r-- | intl/plural-exp.h | 4 |
4 files changed, 18 insertions, 8 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index d34bdfa..0098517 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,9 @@ +2001-11-22 Bruno Haible <bruno@clisp.org> + + * plural-exp.h (GERMANIC_PLURAL): New declaration. + * plural-exp.c (GERMANIC_PLURAL): Renamed from germanic_plural. + * loadmsgcat.c (_nl_unload_domain): Update. + 2001-07-17 Ulrich Drepper <drepper@redhat.com> * localealias.c (read_alias_file): Disable implicit locking diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index dcf307c..c7c10b2 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -426,7 +426,7 @@ internal_function _nl_unload_domain (domain) struct loaded_domain *domain; { - if (domain->plural != &germanic_plural) + if (domain->plural != &__gettext_germanic_plural) __gettext_free_exp (domain->plural); _nl_free_domain_conv (domain); diff --git a/intl/plural-exp.c b/intl/plural-exp.c index 0648299..c937c01 100644 --- a/intl/plural-exp.c +++ b/intl/plural-exp.c @@ -46,7 +46,7 @@ static const struct expression plone = .num = 1 } }; -static struct expression germanic_plural = +struct expression GERMANIC_PLURAL = { .nargs = 2, .operation = not_equal, @@ -69,7 +69,7 @@ static struct expression germanic_plural = static struct expression plvar; static struct expression plone; -static struct expression germanic_plural; +struct expression GERMANIC_PLURAL; static void init_germanic_plural () @@ -83,10 +83,10 @@ init_germanic_plural () plone.operation = num; plone.val.num = 1; - germanic_plural.nargs = 2; - germanic_plural.operation = not_equal; - germanic_plural.val.args[0] = &plvar; - germanic_plural.val.args[1] = &plone; + GERMANIC_PLURAL.nargs = 2; + GERMANIC_PLURAL.operation = not_equal; + GERMANIC_PLURAL.val.args[0] = &plvar; + GERMANIC_PLURAL.val.args[1] = &plone; } } @@ -150,7 +150,7 @@ EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp) English is using since English is a Germanic language. */ no_plural: INIT_GERMANIC_PLURAL (); - *pluralp = &germanic_plural; + *pluralp = &GERMANIC_PLURAL; *npluralsp = 2; } } diff --git a/intl/plural-exp.h b/intl/plural-exp.h index a4b8e96..6422b9b 100644 --- a/intl/plural-exp.h +++ b/intl/plural-exp.h @@ -91,16 +91,19 @@ struct parse_args #ifdef _LIBC # define FREE_EXPRESSION __gettext_free_exp # define PLURAL_PARSE __gettextparse +# define GERMANIC_PLURAL __gettext_germanic_plural # define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural # define PLURAL_EVAL __gettext_plural_eval #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 PLURAL_EVAL gettext_plural_eval__ #else # define FREE_EXPRESSION free_plural_expression # define PLURAL_PARSE parse_plural_expression +# define GERMANIC_PLURAL germanic_plural # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression # define PLURAL_EVAL plural_eval #endif @@ -108,6 +111,7 @@ struct parse_args extern void FREE_EXPRESSION PARAMS ((struct expression *exp)) internal_function; extern int PLURAL_PARSE PARAMS ((void *arg)); +extern struct expression GERMANIC_PLURAL; extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry, struct expression **pluralp, unsigned long int *npluralsp)) |