aboutsummaryrefslogtreecommitdiff
path: root/intl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-08-15 17:52:59 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-08-31 15:59:06 +0200
commitd7ccc6c983632f89064e0405e724ca6e9c1b9e1e (patch)
tree2ec4f8e58e1720b3956c193150a081f570730bb6 /intl
parentdab0eecef632487f01460900ede02874092c9169 (diff)
downloadglibc-d7ccc6c983632f89064e0405e724ca6e9c1b9e1e.zip
glibc-d7ccc6c983632f89064e0405e724ca6e9c1b9e1e.tar.gz
glibc-d7ccc6c983632f89064e0405e724ca6e9c1b9e1e.tar.bz2
iconv, intl, locale, wcsmbs: Remove internal_function
Also adjust parts of the time subdirectory.
Diffstat (limited to 'intl')
-rw-r--r--intl/dcigettext.c19
-rw-r--r--intl/eval-plural.h1
-rw-r--r--intl/finddomain.c1
-rw-r--r--intl/gettextP.h18
-rw-r--r--intl/loadinfo.h4
-rw-r--r--intl/loadmsgcat.c3
-rw-r--r--intl/localealias.c8
-rw-r--r--intl/plural-exp.c1
-rw-r--r--intl/plural-exp.h10
-rw-r--r--intl/plural.c1
-rw-r--r--intl/plural.y1
11 files changed, 14 insertions, 53 deletions
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index f63b34b..80750f3 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -347,18 +347,15 @@ struct binding *_nl_domain_bindings;
/* Prototypes for local functions. */
static char *plural_lookup (struct loaded_l10nfile *domain,
unsigned long int n,
- const char *translation, size_t translation_len)
- internal_function;
+ const char *translation, size_t translation_len);
#ifdef IN_LIBGLOCALE
static const char *guess_category_value (int category,
const char *categoryname,
- const char *localename)
- internal_function;
+ const char *localename);
#else
static const char *guess_category_value (int category,
- const char *categoryname)
- internal_function;
+ const char *categoryname);
#endif
#ifdef _LIBC
@@ -366,11 +363,10 @@ static const char *guess_category_value (int category,
# define category_to_name(category) \
_nl_category_names.str + _nl_category_name_idxs[category]
#else
-static const char *category_to_name (int category) internal_function;
+static const char *category_to_name (int category);
#endif
#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
-static const char *get_output_charset (struct binding *domainbinding)
- internal_function;
+static const char *get_output_charset (struct binding *domainbinding);
#endif
@@ -868,7 +864,6 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
in case of a memory allocation failure during conversion (only if
ENCODING != NULL resp. CONVERT == true). */
char *
-internal_function
#ifdef IN_LIBGLOCALE
_nl_find_msg (struct loaded_l10nfile *domain_file,
struct binding *domainbinding, const char *encoding,
@@ -1401,7 +1396,6 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
/* Look up a plural variant. */
static char *
-internal_function
plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
const char *translation, size_t translation_len)
{
@@ -1439,7 +1433,6 @@ plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
#ifndef _LIBC
/* Return string representation of locale CATEGORY. */
static const char *
-internal_function
category_to_name (int category)
{
const char *retval;
@@ -1500,7 +1493,6 @@ category_to_name (int category)
/* Guess value of current locale from value of the environment variables
or system-dependent defaults. */
static const char *
-internal_function
#ifdef IN_LIBGLOCALE
guess_category_value (int category, const char *categoryname,
const char *locale)
@@ -1591,7 +1583,6 @@ guess_category_value (int category, const char *categoryname)
#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
/* Returns the output charset. */
static const char *
-internal_function
get_output_charset (struct binding *domainbinding)
{
/* The output charset should normally be determined by the locale. But
diff --git a/intl/eval-plural.h b/intl/eval-plural.h
index 664b809..4bc6f44 100644
--- a/intl/eval-plural.h
+++ b/intl/eval-plural.h
@@ -21,7 +21,6 @@
/* Evaluate the plural expression and return an index value. */
STATIC
unsigned long int
-internal_function
plural_eval (const struct expression *pexp, unsigned long int n)
{
switch (pexp->nargs)
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 88fd880..78718b3 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -55,7 +55,6 @@ static struct loaded_l10nfile *_nl_loaded_domains;
the DOMAINNAME and CATEGORY parameters with respect to the currently
established bindings. */
struct loaded_l10nfile *
-internal_function
_nl_find_domain (const char *dirname, char *locale,
const char *domainname, struct binding *domainbinding)
{
diff --git a/intl/gettextP.h b/intl/gettextP.h
index eeb8970..8fcfb5b 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -61,7 +61,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 +89,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
@@ -255,23 +251,19 @@ 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;
+ struct binding *__domainbinding);
void _nl_load_domain (struct loaded_l10nfile *__domain,
- struct binding *__domainbinding)
- internal_function;
+ struct binding *__domainbinding);
#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;
+ size_t *lengthp);
#else
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
struct binding *domainbinding, const char *msgid,
- int convert, size_t *lengthp)
- internal_function;
+ int convert, size_t *lengthp);
#endif
/* The internal variables in the standalone libintl.a must have different
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 602ee82..38dbc31 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -30,10 +30,6 @@
in gettextP.h.
*/
-#ifndef internal_function
-# define internal_function
-#endif
-
#ifndef LIBINTL_DLL_EXPORTED
# define LIBINTL_DLL_EXPORTED
#endif
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 13e2f2a..e8b2314 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -749,7 +749,6 @@ get_sysdep_segment_value (const char *name)
/* Load the message catalogs specified by FILENAME. If it is no valid
message catalog do nothing. */
void
-internal_function
_nl_load_domain (struct loaded_l10nfile *domain_file,
struct binding *domainbinding)
{
@@ -1285,7 +1284,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
#ifdef _LIBC
void
-internal_function __libc_freeres_fn_section
+__libc_freeres_fn_section
_nl_unload_domain (struct loaded_domain *domain)
{
size_t i;
diff --git a/intl/localealias.c b/intl/localealias.c
index 9921aa2..08662f7 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -88,10 +88,6 @@ char *alloca ();
# include "lock.h"
#endif
-#ifndef internal_function
-# define internal_function
-#endif
-
/* Some optimizations for glibc. */
#ifdef _LIBC
# define FEOF(fp) feof_unlocked (fp)
@@ -143,8 +139,7 @@ static size_t maxmap;
/* Prototypes for local functions. */
-static size_t read_alias_file (const char *fname, int fname_len)
- internal_function;
+static size_t read_alias_file (const char *fname, int fname_len);
static int extend_alias_table (void);
static int alias_compare (const struct alias_map *map1,
const struct alias_map *map2);
@@ -212,7 +207,6 @@ _nl_expand_alias (const char *name)
static size_t
-internal_function
read_alias_file (const char *fname, int fname_len)
{
FILE *fp;
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index f3a45fa..8c15032 100644
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -94,7 +94,6 @@ init_germanic_plural (void)
#endif
void
-internal_function
EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
const struct expression **pluralp,
unsigned long int *npluralsp)
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index 144aa1e..4833fcd 100644
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -18,10 +18,6 @@
#ifndef _PLURAL_EXP_H
#define _PLURAL_EXP_H
-#ifndef internal_function
-# define internal_function
-#endif
-
#ifndef attribute_hidden
# define attribute_hidden
#endif
@@ -105,14 +101,12 @@ struct parse_args
# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
#endif
-extern void FREE_EXPRESSION (struct expression *exp)
- internal_function;
+extern void FREE_EXPRESSION (struct expression *exp);
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)
- internal_function;
+ unsigned long int *npluralsp);
#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
extern unsigned long int plural_eval (const struct expression *pexp,
diff --git a/intl/plural.c b/intl/plural.c
index c2aa7d7..73a7163 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -1836,7 +1836,6 @@ yyreturn:
void
-internal_function
FREE_EXPRESSION (struct expression *exp)
{
if (exp == NULL)
diff --git a/intl/plural.y b/intl/plural.y
index 5f94565..78a7453 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -207,7 +207,6 @@ exp: exp '?' exp ':' exp
%%
void
-internal_function
FREE_EXPRESSION (struct expression *exp)
{
if (exp == NULL)