Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / intl / textdomain.c

diff --git a/intl/textdomain.c b/intl/textdomain.c
index 70131bc8082bd9be4dc4b1aef633dd1da5bfbdbd..8745a8435e15c07002a3457ec957ab35a51b56ac 100644 (file)
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,5 +1,5 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
@@ -23,25 +23,39 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
 # include "libgnuintl.h"
 #endif
+#include "gettextP.h"
 
-/* Handle multi-threaded applications.  */
 #ifdef _LIBC
+/* We have to handle multi-threaded applications.  */
 # include <bits/libc-lock.h>
-# define gl_rwlock_define __libc_rwlock_define
-# define gl_rwlock_wrlock __libc_rwlock_wrlock
-# define gl_rwlock_unlock __libc_rwlock_unlock
 #else
-# include "lock.h"
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# 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 libintl_nl_default_default_domain
+# define _nl_current_default_domain libintl_nl_current_default_domain
 #endif
 
 /* @@ end of prolog @@ */
 
+/* Name of the default text domain.  */
+extern const char _nl_default_default_domain[] attribute_hidden;
+
+/* Default text domain in which entries for gettext(3) are to be found.  */
+extern const char *_nl_current_default_domain attribute_hidden;
+
 
 /* Names for the libintl functions are a problem.  They must not clash
    with existing names and they should follow ANSI C.  But this source
@@ -57,7 +71,7 @@
 #endif
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
@@ -72,7 +86,7 @@ TEXTDOMAIN (const char *domainname)
   if (domainname == NULL)
     return (char *) _nl_current_default_domain;
 
-  gl_rwlock_wrlock (_nl_state_lock);
+  __libc_rwlock_wrlock (_nl_state_lock);
 
   old_domain = (char *) _nl_current_default_domain;
 
@@ -116,7 +130,7 @@ TEXTDOMAIN (const char *domainname)
        free (old_domain);
     }
 
-  gl_rwlock_unlock (_nl_state_lock);
+  __libc_rwlock_unlock (_nl_state_lock);
 
   return new_domain;
 }