dcgettext.c: Outside libc, use local variable names that don't clash with those in...

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.

From-SVN: r36516

diff --git a/gcc/intl/ChangeLog b/gcc/intl/ChangeLog
index 1754c116dd3ff77ad440476ef0f5fd51585f4170..56efee29c533690fba2db265435a8fc1098ab46c 100644 (file)
--- 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 d9c3f349e04dee8aad8a06ecc76cacc4ccc187ba..c143cbc237b22d8175f982e2505ee336e04c2a0c 100644 (file)
--- 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 a830f1de12425db91fc2c584235cb435de4bc35b..65de78b9cfbbf89a7c09f4a9d1497ad2f5370687 100644 (file)
--- 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 88557460f3b3a6535da599ba233f51309b276999..e25a086619648292481634b7d0280b8eed90b482 100644 (file)
--- 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.  */