diff options
| author | pthomas <pthomas@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-18 22:05:52 +0000 |
|---|---|---|
| committer | pthomas <pthomas@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-18 22:05:52 +0000 |
| commit | 67c50934dba8a669a00a3798900f150a84cbe27e (patch) | |
| tree | 529472188fb11244ff641d3cfe5da53a7d7cdae7 /gcc/intl | |
| parent | cbc0ce7d635a8cd53666a9e0e163594b230edce8 (diff) | |
| download | gcc-67c50934dba8a669a00a3798900f150a84cbe27e.tar.gz | |
2000-09-18 Bruno Haible <haible@clisp.cons.org>
* intl/dcgettext.c: Outside libc, use local variable names that don't
clash with those in libc.
* intl/bindtextdom.c: Likewise.
* intl/textdomain.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36516 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/intl')
| -rw-r--r-- | gcc/intl/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/intl/bindtextdom.c | 8 | ||||
| -rw-r--r-- | gcc/intl/dcgettext.c | 10 | ||||
| -rw-r--r-- | gcc/intl/textdomain.c | 8 |
4 files changed, 33 insertions, 0 deletions
diff --git a/gcc/intl/ChangeLog b/gcc/intl/ChangeLog index 1754c116dd3..56efee29c53 100644 --- a/gcc/intl/ChangeLog +++ b/gcc/intl/ChangeLog @@ -1,3 +1,10 @@ +2000-09-18 Bruno Haible <haible@clisp.cons.org> + + * intl/dcgettext.c: Outside libc, use local variable names that don't + clash with those in libc. + * intl/bindtextdom.c: Likewise. + * intl/textdomain.c: Likewise. + 2000-09-05 John David Anglin <dave@hiauly1.hia.nrc.ca> * gettext.h (nls_uint32): Choose via INT_MAX instead of UINT_MAX. diff --git a/gcc/intl/bindtextdom.c b/gcc/intl/bindtextdom.c index d9c3f349e04..c143cbc237b 100644 --- a/gcc/intl/bindtextdom.c +++ b/gcc/intl/bindtextdom.c @@ -46,6 +46,14 @@ void free (); #include "gettext.h" #include "gettextP.h" +/* 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/gcc/intl/dcgettext.c b/gcc/intl/dcgettext.c index a830f1de124..65de78b9cfb 100644 --- a/gcc/intl/dcgettext.c +++ b/gcc/intl/dcgettext.c @@ -85,6 +85,16 @@ void free (); #endif #include "hash-string.h" +/* 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/gcc/intl/textdomain.c b/gcc/intl/textdomain.c index 88557460f3b..e25a0866196 100644 --- a/gcc/intl/textdomain.c +++ b/gcc/intl/textdomain.c @@ -39,6 +39,14 @@ # include "libgettext.h" #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. */ |