Sync move-if-change from Gnulib, updating copyright

[thirdparty/glibc.git] / intl / gettextP.h

diff --git a/intl/gettextP.h b/intl/gettextP.h
index bbd213988b92661ee170a54323edc94e113adc8e..e70c3ba7f945c41435234b5bf5fa67e2019a7404 100644 (file)
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2022 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -13,7 +13,7 @@
    GNU Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
@@ -30,7 +30,7 @@
 
 /* Handle multi-threaded applications.  */
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 # define gl_rwlock_define __libc_rwlock_define
 #else
 # include "lock.h"
@@ -49,11 +49,12 @@ extern char *__dngettext (const char *__domainname,
                          unsigned long int n);
 extern char *__dcngettext (const char *__domainname,
                           const char *__msgid1, const char *__msgid2,
-                          unsigned long int __n, int __category);
+                          unsigned long int __n, int __category)
+     attribute_hidden;
 extern char *__dcigettext (const char *__domainname,
                           const char *__msgid1, const char *__msgid2,
                           int __plural, unsigned long int __n,
-                          int __category);
+                          int __category) attribute_hidden;
 extern char *__textdomain (const char *__domainname);
 extern char *__bindtextdomain (const char *__domainname,
                               const char *__dirname);
@@ -61,7 +62,7 @@ extern char *__bind_textdomain_codeset (const char *__domainname,
                                        const char *__codeset);
 extern void _nl_finddomain_subfreeres (void) attribute_hidden;
 extern void _nl_unload_domain (struct loaded_domain *__domain)
-     internal_function attribute_hidden;
+     attribute_hidden;
 #else
 /* Declare the exported libintl_* functions, in a way that allows us to
    call them under their real name.  */
@@ -89,10 +90,6 @@ extern char *libintl_dcigettext (const char *__domainname,
 
 /* @@ end of prolog @@ */
 
-#ifndef internal_function
-# define internal_function
-#endif
-
 #ifndef attribute_hidden
 # define attribute_hidden
 #endif
@@ -256,22 +253,22 @@ extern const char *_nl_locale_name_default (void);
 struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
                                         const char *__domainname,
                                         struct binding *__domainbinding)
-     internal_function;
+     attribute_hidden;
 void _nl_load_domain (struct loaded_l10nfile *__domain,
                      struct binding *__domainbinding)
-     internal_function;
+     attribute_hidden;
 
 #ifdef IN_LIBGLOCALE
 char *_nl_find_msg (struct loaded_l10nfile *domain_file,
                    struct binding *domainbinding, const char *encoding,
                    const char *msgid,
                    size_t *lengthp)
-     internal_function;
+     attribute_hidden;
 #else
 char *_nl_find_msg (struct loaded_l10nfile *domain_file,
                    struct binding *domainbinding, const char *msgid,
                    int convert, size_t *lengthp)
-     internal_function;
+     attribute_hidden;
 #endif
 
 /* The internal variables in the standalone libintl.a must have different