+2000-09-18 Bruno Haible <haible@clisp.cons.org>
+
+ * intl/dcigettext.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-28 Ulrich Drepper <drepper@redhat.com>
* elf/ldconfig.c (parse_conf): Print full name of config dir
# 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. */
((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
# 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. */