diff options
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/bindtextdom.c | 8 | ||||
| -rw-r--r-- | intl/dcigettext.c | 10 | ||||
| -rw-r--r-- | intl/textdomain.c | 8 |
3 files changed, 26 insertions, 0 deletions
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c index 4ea368d..7de81c6 100644 --- a/intl/bindtextdom.c +++ b/intl/bindtextdom.c @@ -57,6 +57,14 @@ void free (); # define __libc_rwlock_unlock(NAME) #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_dirname _nl_default_dirname__ +# define _nl_domain_bindings _nl_domain_bindings__ +#endif + /* @@ end of prolog @@ */ /* Contains the default location of the message catalogs. */ 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 diff --git a/intl/textdomain.c b/intl/textdomain.c index 2a4b67c..fe9f171 100644 --- a/intl/textdomain.c +++ b/intl/textdomain.c @@ -51,6 +51,14 @@ # define __libc_rwlock_unlock(NAME) #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__ +#endif + /* @@ end of prolog @@ */ /* Name of the default text domain. */ |