From 52d895a4ce96bba606fdc11619ae213a29fff4be Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 29 Sep 2000 06:21:56 +0000 Subject: Update. 2000-09-18 Bruno Haible * intl/dcigettext.c: Outside libc, use local variable names that don't clash with those in libc. * intl/bindtextdom.c: Likewise. * intl/textdomain.c: Likewise. --- intl/dcigettext.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'intl/dcigettext.c') diff --git a/intl/dcigettext.c b/intl/dcigettext.c index e431e42..7d7081d 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -119,6 +119,16 @@ void free (); ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2) #endif +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_default_domain _nl_default_default_domain__ +# define _nl_current_default_domain _nl_current_default_domain__ +# define _nl_default_dirname _nl_default_dirname__ +# define _nl_domain_bindings _nl_domain_bindings__ +#endif + /* @@ end of prolog @@ */ #ifdef _LIBC -- cgit v1.1