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

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

gcc/intl/ChangeLog

+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.

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.  */

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

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.  */