Fix a link error when linking statically with glibc.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 8ab9155fe747db3758b53668e28e15a7c251bd54..d51b5850b99001fa6b7c5b267492f586f0fd3899 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-18  Bruno Haible  <haible@clisp.cons.org>
+
+       * dcigettext.c: Outside libc, use local variable names that don't
+       clash with those in libc.
+       * bindtextdom.c: Likewise.
+       * textdomain.c: Likewise.
+
 2000-07-31  Bruno Haible  <haible@clisp.cons.org>
 
        * plural.y: Include config.h. Needed to define 'inline' away for C

diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 156c8f02b69fd52f5eae2ad473b0f12febf93fc1..f921177086cb5e800ad9fbb422dbe704faef9053 100644 (file)
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -56,6 +56,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 9f38b1b91170bd7fed72570891b481c5e05b44e1..d6092461ccb1c1ea75d0f80379d3909c20b30d91 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -117,6 +117,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 d84cbd93284b55f9a04c01d717cf30d4fb7d3bd4..da278b946e45baaf30f0f785b4b823fad2bcfc7d 100644 (file)
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -50,6 +50,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.  */