Track changes made in glibc-cvs, from 2001-12-01 to 2002-04-19.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 119b3b47692c7e0af6c300ed9ebf4829e49dff66..3517366e16a82e0673766cca618a280109c125a3 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,34 @@
+2002-04-19  Bruno Haible  <bruno@clisp.org>
+
+       * gettextP.h (attribute_hidden): Define as empty macro if not
+       already defined.
+
+2002-04-09  Ulrich Drepper  <drepper@redhat.com>
+
+       * dcngettext.c [_LIBC]: Use INTUSE for __dcngettext.
+       * dngettext.c [_LIBC] (DCNGETTEXT): Use INTUSE.
+       * ngettext.c: Likewise.
+       * l10nflist.c [_LIBC]: Use INTUSE for __argz_count and
+       __argz_stringify.
+
+2002-04-08  Ulrich Drepper  <drepper@redhat.com>
+       * dcgettext.c (__dcgettext): Use INTDEF to define alias.
+       * dgettext.c: Call __dcgettext_internal instead of __dcgettext.
+       * gettext.c: Likewise.
+
+2002-03-12  Ulrich Drepper  <drepper@redhat.com>
+
+       * plural-exp.h (attribute_hidden): Define as empty macro if not
+       already defined.
+       (GERMANIC_PLURAL): Declare as hidden.
+       * dcigettext.c (_nl_default_default_domain): Define as hidden.
+       (_nl_current_default_domain): Likewise
+       (_nl_state_lock): Likewise.
+       * textdomain.c (_nl_default_default_domain): Declare as hidden.
+       (_nl_current_default_domain): Likewise
+       (_nl_state_lock): Likewise.
+       * bindtextdom.c (_nl_state_lock): Likewise.
+
 2002-03-15  Andrew Zabolotny  <zap@cobra.ru>
 
        * os2compat.h: Use prefix _nlos2 instead of _os2, to avoid any

diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 07e073d6425d395136d018a523f1f9c404159b10..a3c233d7706b77190bbffd65f01524907bf07f94 100644 (file)
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000, 2001, 2002 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
@@ -63,7 +63,7 @@ extern const char _nl_default_dirname[];
 extern struct binding *_nl_domain_bindings;
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 
 /* Names for the libintl functions are a problem.  They must not clash

diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index b7c96523dd881e368b1406c064279d14ed26b8bc..70ee3bafe5443f3ee343e2cae71fe4beb2910ed4 100644 (file)
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000, 2001, 2002 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
@@ -54,5 +54,6 @@ DCGETTEXT (domainname, msgid, category)
 
 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
+INTDEF(__dcgettext)
 weak_alias (__dcgettext, dcgettext);
 #endif

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 2e724e19e74be74e5631016b6bdcc655701900c2..afbb181f8676cd030ab9bc8f446c6dd0fb79301f 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -259,10 +259,11 @@ transcmp (p1, p2)
 
 /* Name of the default domain used for gettext(3) prior any call to
    textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
+const char _nl_default_default_domain[] attribute_hidden = "messages";
 
 /* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
+const char *_nl_current_default_domain attribute_hidden
+     = _nl_default_default_domain;
 
 /* Contains the default location of the message catalogs.  */
 #if defined __EMX__
@@ -348,7 +349,7 @@ typedef unsigned char transmem_block_t;
 
 /* Lock variable to protect the global data in the gettext implementation.  */
 #ifdef _LIBC
-__libc_rwlock_define_initialized (, _nl_state_lock)
+__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
 #endif
 
 /* Checking whether the binaries runs SUID must be done and glibc provides

diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index c16af21269c1be57bcf0563981ab0610274f8251..d31ff9bfaec6aa524b7fbb297690a730d84ff553 100644 (file)
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000, 2001, 2002 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
@@ -56,5 +56,6 @@ DCNGETTEXT (domainname, msgid1, msgid2, n, category)
 
 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
+INTDEF(__dcngettext)
 weak_alias (__dcngettext, dcngettext);
 #endif

diff --git a/intl/dgettext.c b/intl/dgettext.c
index 3651207a0f680f3dcad617ffc91986aaaf21724c..17b0442c662c003a8c036df8fafcb75b82ada2a5 100644 (file)
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001, 2002 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
@@ -37,7 +37,7 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
+# define DCGETTEXT INTUSE(__dcgettext)
 #else
 # define DGETTEXT dgettext__
 # define DCGETTEXT dcgettext__

diff --git a/intl/dngettext.c b/intl/dngettext.c
index f214e95b471f22d3a635c58232177cf9fa3002ae..2b9ff886bdd2620392bf501d958873fdef8514c8 100644 (file)
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001, 2002 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
@@ -37,7 +37,7 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DNGETTEXT __dngettext
-# define DCNGETTEXT __dcngettext
+# define DCNGETTEXT INTUSE(__dcngettext)
 #else
 # define DNGETTEXT dngettext__
 # define DCNGETTEXT dcngettext__

diff --git a/intl/gettext.c b/intl/gettext.c
index 22a6c24536ec3bef8b37aa613f84854e0afa6447..e52d8aef3ce8b460bfce2925b3f41c459611198c 100644 (file)
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,5 +1,5 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000, 2001, 2002 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
@@ -42,7 +42,7 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define GETTEXT __gettext
-# define DCGETTEXT __dcgettext
+# define DCGETTEXT INTUSE(__dcgettext)
 #else
 # define GETTEXT gettext__
 # define DCGETTEXT dcgettext__

diff --git a/intl/gettextP.h b/intl/gettextP.h
index a642fdb6dea218d5ab731143b434ac45d3c7feec..4e3a5b252ec7f81f0d16fa096f035548d6db0921 100644 (file)
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -48,6 +48,10 @@
 # define internal_function
 #endif
 
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
 /* Tell the compiler when a conditional or integer expression is
    almost always true or almost always false.  */
 #ifndef HAVE_BUILTIN_EXPECT

diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 5f042325ccd11e3c7f9d14c3dfbf9e03768bb960..d861912df46fc2834d2da19b41ed25fe246213bb 100644 (file)
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -85,6 +85,10 @@ argz_count__ (argz, len)
 }
 # undef __argz_count
 # define __argz_count(argz, len) argz_count__ (argz, len)
+#else
+# ifdef _LIBC
+#  define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
+# endif
 #endif /* !_LIBC && !HAVE___ARGZ_COUNT */
 
 #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
@@ -109,6 +113,11 @@ argz_stringify__ (argz, len, sep)
 }
 # undef __argz_stringify
 # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
+#else
+# ifdef _LIBC
+#  define __argz_stringify(argz, len, sep) \
+  INTUSE(__argz_stringify) (argz, len, sep)
+# endif
 #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
 
 #if !defined _LIBC && !defined HAVE___ARGZ_NEXT

diff --git a/intl/ngettext.c b/intl/ngettext.c
index fb3ec5a91ea076ca0fa3bbd17eead61739be37ce..b42ff6a1ac4b8ed1b114f1f965f5f6df4c1322a1 100644 (file)
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000, 2001, 2002 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
@@ -44,7 +44,7 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define NGETTEXT __ngettext
-# define DCNGETTEXT __dcngettext
+# define DCNGETTEXT INTUSE(__dcngettext)
 #else
 # define NGETTEXT ngettext__
 # define DCNGETTEXT dcngettext__

diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index 6a4bba01931b9afe55cb3f09aeb9480af0b07921..93cdaef57fd693b20c382a448af5ba623c01c4da 100644 (file)
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -1,5 +1,5 @@
 /* Expression parsing and evaluation for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -32,6 +32,10 @@
 # define internal_function
 #endif
 
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
 
 /* This is the representation of the expressions to determine the
    plural form.  */
@@ -108,7 +112,7 @@ struct parse_args
 extern void FREE_EXPRESSION PARAMS ((struct expression *exp))
      internal_function;
 extern int PLURAL_PARSE PARAMS ((void *arg));
-extern struct expression GERMANIC_PLURAL;
+extern struct expression GERMANIC_PLURAL attribute_hidden;
 extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
                                               struct expression **pluralp,
                                               unsigned long int *npluralsp))

diff --git a/intl/textdomain.c b/intl/textdomain.c
index 2e420ad7729c407a3ec055e8f3713c9d978097de..8fb4ea085b1e68569ac4099bcd6632e4bf722745 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, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000, 2001, 2002 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
@@ -51,10 +51,10 @@
 /* @@ end of prolog @@ */
 
 /* Name of the default text domain.  */
-extern const char _nl_default_default_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;
+extern const char *_nl_current_default_domain attribute_hidden;
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -71,7 +71,7 @@ extern const char *_nl_current_default_domain;
 #endif
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
+__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.