intl: Merge from glibc.

Apply commit
2017-10-01  H.J. Lu  <hjl.tools@gmail.com>
Mark internal functions with attribute_hidden [BZ #18822]

diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
index 5c21505dbab4d379f80ef36d5fe817c30b68e6b7..9a7aa3835a3be058563a57adc83a809eafd9ed3d 100644 (file)
--- a/gettext-runtime/intl/gettextP.h
+++ b/gettext-runtime/intl/gettextP.h
@@ -238,19 +238,23 @@ struct loaded_l10nfile *_nl_find_domain (const char *__dirname,
 #endif
                                         char *__locale,
                                         const char *__domainname,
-                                        struct binding *__domainbinding);
+                                        struct binding *__domainbinding)
+     attribute_hidden;
 void _nl_load_domain (struct loaded_l10nfile *__domain,
-                     struct binding *__domainbinding);
+                     struct binding *__domainbinding)
+     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);
+                   size_t *lengthp)
+     attribute_hidden;
 #else
 char *_nl_find_msg (struct loaded_l10nfile *domain_file,
                    struct binding *domainbinding, const char *msgid,
-                   int convert, size_t *lengthp);
+                   int convert, size_t *lengthp)
+     attribute_hidden;
 #endif
 
 /* The internal variables in the standalone libintl.a must have different

diff --git a/gettext-runtime/intl/plural-exp.h b/gettext-runtime/intl/plural-exp.h
index c00984c0ac73efb2b7f9399bc6de1bdb1bb16d38..abfb4c3315c6e23e3c3e58a914be8c63804117de 100644 (file)
--- a/gettext-runtime/intl/plural-exp.h
+++ b/gettext-runtime/intl/plural-exp.h
@@ -101,12 +101,13 @@ struct parse_args
 # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
 #endif
 
-extern void FREE_EXPRESSION (struct expression *exp);
+extern void FREE_EXPRESSION (struct expression *exp) attribute_hidden;
 extern int PLURAL_PARSE (struct parse_args *arg);
 extern const struct expression GERMANIC_PLURAL attribute_hidden;
 extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
                                       const struct expression **pluralp,
-                                      unsigned long int *npluralsp);
+                                      unsigned long int *npluralsp)
+     attribute_hidden;
 
 #if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
 extern unsigned long int plural_eval (const struct expression *pexp,