{"id":808275,"url":"http://patchwork.ozlabs.org/api/patches/808275/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/patch/20170831151930.001E943994318@oldenburg.str.redhat.com/","project":{"id":41,"url":"http://patchwork.ozlabs.org/api/projects/41/?format=json","name":"GNU C Library","link_name":"glibc","list_id":"libc-alpha.sourceware.org","list_email":"libc-alpha@sourceware.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170831151930.001E943994318@oldenburg.str.redhat.com>","list_archive_url":null,"date":"2017-08-31T15:19:29","name":"[COMMITTED] iconv, intl, locale, wcsmbs: Remove internal_function","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"17258737295c368861da191aa2f2677452050767","submitter":{"id":14312,"url":"http://patchwork.ozlabs.org/api/people/14312/?format=json","name":"Florian Weimer","email":"fweimer@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/glibc/patch/20170831151930.001E943994318@oldenburg.str.redhat.com/mbox/","series":[{"id":848,"url":"http://patchwork.ozlabs.org/api/series/848/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/list/?series=848","date":"2017-08-31T15:19:29","name":"[COMMITTED] iconv, intl, locale, wcsmbs: Remove internal_function","version":1,"mbox":"http://patchwork.ozlabs.org/series/848/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808275/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808275/checks/","tags":{},"related":[],"headers":{"Return-Path":"<libc-alpha-return-83923-incoming=patchwork.ozlabs.org@sourceware.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list libc-alpha@sourceware.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-83923-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=<UNKNOWN>)","ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"MAOsL7Q9\"; dkim-atps=neutral","sourceware.org; auth=none","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=fweimer@redhat.com"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjmJS1881z9s7g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri,  1 Sep 2017 01:19:51 +1000 (AEST)","(qmail 34235 invoked by alias); 31 Aug 2017 15:19:43 -0000","(qmail 34226 invoked by uid 89); 31 Aug 2017 15:19:43 -0000"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:date:to:subject:mime-version:content-type\n\t:content-transfer-encoding:message-id:from; q=dns; s=default; b=\n\tNnPfbht882aNmycKiA0wGmW1ZR/d6oyii8VHpHVvOq8NZjr5L56Kbw8w95QQMAzY\n\taRO3bymIUedl2bR6Y/LD4gvTLCu9Ww+JvX1lS6OxibRppzQS4csrmy7vFyyff7jG\n\t+i/4hSGc3JGa2bq+NtucjN6hZigZdH9P8bIEGonftig=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:date:to:subject:mime-version:content-type\n\t:content-transfer-encoding:message-id:from; s=default; bh=DbOIKd\n\tS1V4bNIjVLn9Nij1699hA=; b=MAOsL7Q9xjhAD3MLlrwCeovtjZtPhKkqY+R6Ac\n\tU7gt2i+yvsKDp1P0AeidGAvNrnhSK443dvvfrdHdo95YIBocto4wFcx/ELDGH7fl\n\tCPnMHwbU0AVf4K+QkcINDSFQpgJN9fiG9mUX0SC6T14IliWiLg2/puaimbaLtWQ9\n\tJFnqk=","Mailing-List":"contact libc-alpha-help@sourceware.org; run by ezmlm","Precedence":"bulk","List-Id":"<libc-alpha.sourceware.org>","List-Unsubscribe":"<mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>","List-Subscribe":"<mailto:libc-alpha-subscribe@sourceware.org>","List-Archive":"<http://sourceware.org/ml/libc-alpha/>","List-Post":"<mailto:libc-alpha@sourceware.org>","List-Help":"<mailto:libc-alpha-help@sourceware.org>,\n\t<http://sourceware.org/ml/#faqs>","Sender":"libc-alpha-owner@sourceware.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0,\n\tGIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,\n\tKAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD,\n\tSPF_HELO_PASS autolearn=ham version=3.3.2 spammy=","X-HELO":"mx1.redhat.com","DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 79335838","Date":"Thu, 31 Aug 2017 17:19:29 +0200","To":"libc-alpha@sourceware.org","Subject":"[PATCH COMMITTED] iconv, intl, locale, wcsmbs: Remove\n\tinternal_function","User-Agent":"Heirloom mailx 12.5 7/5/10","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Transfer-Encoding":"7bit","Message-Id":"<20170831151930.001E943994318@oldenburg.str.redhat.com>","From":"fweimer@redhat.com (Florian Weimer)"},"content":"Also adjust parts of the time subdirectory.\n\n2017-08-31  Florian Weimer  <fweimer@redhat.com>\n\n\t* iconv/gconv.c (__gconv): Remove internal_function.\n\t* iconv/gconv_builtin.c (__gconv_get_builtin_trans): Likewise.\n\t* iconv/gconv_cache.c (__gconv_load_cache, find_module_idx)\n\t(find_module, __gconv_compare_alias_cache, __gconv_lookup_cache)\n\t(__gconv_release_cache): Likewise.\n\t* iconv/gconv_close.c (__gconv_close): Likewise.\n\t* iconv/gconv_conf.c (detect_conflict, insert_module, add_module)\n\t(read_conf_file, __gconv_get_path): Likewise.\n\t* iconv/gconv_db.c (derivation_lookup, add_derivation)\n\t(__gconv_release_step, gen_steps, increment_counter)\n\t(find_derivation, __gconv_compare_alias, __gconv_find_transform)\n\t(__gconv_close_transform, free_modules_db): Likewise.\n\t* iconv/gconv_dl.c (__gconv_find_shlib, __gconv_release_shlib):\n\tLikewise.\n\t* iconv/gconv_int.h (__gconv_open, __gconv_close, __gconv)\n\t(__gconv_find_transform, __gconv_lookup_cache)\n\t(__gconv_release_step, __gconv_load_cache, __gconv_get_path)\n\t(__gconv_close_transform, __gconv_release_cache)\n\t(__gconv_loaded_object, __gconv_release_shlib)\n\t(__gconv_compare_alias): Likewise.\n\t* iconv/gconv_open.c (__gconv_open): Likewise.\n\t* iconv/iconv_prog.c (print_known_names, add_known_names): Likewise.\n\t* iconv/iconvconfig.c (add_module): Likewise.\n\t* intl/dcigettext.c (plural_lookup, guess_category_value)\n\t(category_to_name, get_output_charset, _nl_find_msg): Likewise.\n\t* intl/eval-plural.h (plural_eval): Likewise.\n\t* intl/finddomain.c (_nl_find_domain): Likewise.\n\t* intl/gettextP.h (_nl_unload_domain, _nl_find_domain)\n\t(_nl_load_domain, _nl_find_msg): Likewise.\n\t(internal_function): Remove definition.\n\t* intl/loadinfo.h (internal_function): Likewise.\n\t* intl/loadmsgcat.c (_nl_load_domain, _nl_unload_domain): Remove\n\tinternal_function.\n\t* intl/localealias.c (internal_function): Remove definition.\n\t(read_alias_file): Remove internal_function.\n\t* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Likewise.\n\t* intl/plural-exp.h (internal_function): Remove definition.\n\t(FREE_EXPRESSION, EXTRACT_PLURAL_EXPRESSION): Remove\n\tinternal_function.\n\t* intl/plural.c: Regenerate.\n\t* intl/plural.y (FREE_EXPRESSION): Remove internal_function.\n\t* locale/coll-lookup.c (__collidx_table_lookup)\n\t(__collseq_table_lookup): Likewise.\n\t* locale/coll-lookup.h (__collidx_table_lookup)\n\t(__collseq_table_lookup): Likewise.\n\t* locale/findlocale.c (_nl_find_locale, _nl_remove_locale): Likewise.\n\t* locale/loadarchive.c (_nl_load_locale_from_archive): Likewise.\n\t* locale/loadlocale.c (_nl_intern_locale_data, _nl_load_locale)\n\t(_nl_unload_locale): Likewise.\n\t* locale/localeinfo.h (struct __locale_data): Remove\n\tinternal_function from cleanup member.\n\t(_nl_find_locale, _nl_load_locale, _nl_unload_locale)\n\t(_nl_remove_locale, _nl_load_locale_from_archive)\n\t(_nl_intern_locale_data, _nl_get_era_entry, _nl_select_era_entry)\n\t(_nl_get_alt_digit, _nl_get_walt_digit, _nl_parse_alt_digit)\n\t(_nl_cleanup_time): Remove internal_function.\n\t* time/alt_digit.c (_nl_get_alt_digit, _nl_get_walt_digit)\n\t(_nl_parse_alt_digit): Likewise.\n\t* time/era.c (_nl_init_era_entries, _nl_get_era_entry)\n\t(_nl_select_era_entry): Likewise.\n\t* time/lc-time-cleanup.c (_nl_cleanup_time): Likewise.\n\t* wcsmbs/wcsmbsload.c (__wcsmbs_load_conv, __wcsmbs_clone_conv)\n\t(__wcsmbs_named_conv, _nl_cleanup_ctype): Likewise.","diff":"diff --git a/iconv/gconv.c b/iconv/gconv.c\nindex 0aab0546b9..3531752189 100644\n--- a/iconv/gconv.c\n+++ b/iconv/gconv.c\n@@ -28,7 +28,6 @@\n \n \n int\n-internal_function\n __gconv (__gconv_t cd, const unsigned char **inbuf,\n \t const unsigned char *inbufend, unsigned char **outbuf,\n \t unsigned char *outbufend, size_t *irreversible)\ndiff --git a/iconv/gconv_builtin.c b/iconv/gconv_builtin.c\nindex 111233dab5..dbcd04b27f 100644\n--- a/iconv/gconv_builtin.c\n+++ b/iconv/gconv_builtin.c\n@@ -59,7 +59,6 @@ static const struct builtin_map\n \n \n void\n-internal_function\n __gconv_get_builtin_trans (const char *name, struct __gconv_step *step)\n {\n   size_t cnt;\ndiff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c\nindex 7d2751a506..07445788a4 100644\n--- a/iconv/gconv_cache.c\n+++ b/iconv/gconv_cache.c\n@@ -45,7 +45,6 @@ __gconv_get_cache (void)\n \n \n int\n-internal_function\n __gconv_load_cache (void)\n {\n   int fd;\n@@ -142,7 +141,6 @@ __gconv_load_cache (void)\n \n \n static int\n-internal_function\n find_module_idx (const char *str, size_t *idxp)\n {\n   unsigned int idx;\n@@ -181,7 +179,6 @@ find_module_idx (const char *str, size_t *idxp)\n \n #ifndef STATIC_GCONV\n static int\n-internal_function\n find_module (const char *directory, const char *filename,\n \t     struct __gconv_step *result)\n {\n@@ -227,7 +224,6 @@ find_module (const char *directory, const char *filename,\n \n \n int\n-internal_function\n __gconv_compare_alias_cache (const char *name1, const char *name2, int *result)\n {\n   size_t name1_idx;\n@@ -247,7 +243,6 @@ __gconv_compare_alias_cache (const char *name1, const char *name2, int *result)\n \n \n int\n-internal_function\n __gconv_lookup_cache (const char *toset, const char *fromset,\n \t\t      struct __gconv_step **handle, size_t *nsteps, int flags)\n {\n@@ -449,7 +444,6 @@ __gconv_lookup_cache (const char *toset, const char *fromset,\n \n /* Free memory allocated for the transformation record.  */\n void\n-internal_function\n __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)\n {\n   if (gconv_cache != NULL)\ndiff --git a/iconv/gconv_close.c b/iconv/gconv_close.c\nindex 4853dd8779..3a908ee8f1 100644\n--- a/iconv/gconv_close.c\n+++ b/iconv/gconv_close.c\n@@ -23,7 +23,6 @@\n \n \n int\n-internal_function\n __gconv_close (__gconv_t cd)\n {\n   struct __gconv_step *srunp;\ndiff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c\nindex 5aa055de6e..f1c28ce83a 100644\n--- a/iconv/gconv_conf.c\n+++ b/iconv/gconv_conf.c\n@@ -99,7 +99,6 @@ const char *__gconv_path_envvar;\n \n /* Test whether there is already a matching module known.  */\n static int\n-internal_function\n detect_conflict (const char *alias)\n {\n   struct gconv_module *node = __gconv_modules_db;\n@@ -183,7 +182,6 @@ add_alias (char *rp, void *modules)\n \n /* Insert a data structure for a new module in the search tree.  */\n static void\n-internal_function\n insert_module (struct gconv_module *newp, int tobefreed)\n {\n   struct gconv_module **rootp = &__gconv_modules_db;\n@@ -242,7 +240,6 @@ insert_module (struct gconv_module *newp, int tobefreed)\n \n /* Add new module.  */\n static void\n-internal_function\n add_module (char *rp, const char *directory, size_t dir_len, void **modules,\n \t    size_t *nmodules, int modcounter)\n {\n@@ -357,7 +354,6 @@ add_module (char *rp, const char *directory, size_t dir_len, void **modules,\n \n /* Read the next configuration file.  */\n static void\n-internal_function\n read_conf_file (const char *filename, const char *directory, size_t dir_len,\n \t\tvoid **modules, size_t *nmodules)\n {\n@@ -425,7 +421,6 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len,\n \n /* Determine the directories we are looking for data in.  */\n void\n-internal_function\n __gconv_get_path (void)\n {\n   struct path_elem *result;\ndiff --git a/iconv/gconv_db.c b/iconv/gconv_db.c\nindex 96f087192e..8fcb3cd92b 100644\n--- a/iconv/gconv_db.c\n+++ b/iconv/gconv_db.c\n@@ -121,7 +121,6 @@ static void *known_derivations;\n \n /* Look up whether given transformation was already requested before.  */\n static int\n-internal_function\n derivation_lookup (const char *fromset, const char *toset,\n \t\t   struct __gconv_step **handle, size_t *nsteps)\n {\n@@ -143,7 +142,6 @@ derivation_lookup (const char *fromset, const char *toset,\n \n /* Add new derivation to list of known ones.  */\n static void\n-internal_function\n add_derivation (const char *fromset, const char *toset,\n \t\tstruct __gconv_step *handle, size_t nsteps)\n {\n@@ -204,7 +202,6 @@ free_derivation (void *p)\n \n /* Decrement the reference count for a single step in a steps array.  */\n void\n-internal_function\n __gconv_release_step (struct __gconv_step *step)\n {\n   /* Skip builtin modules; they are not reference counted.  */\n@@ -230,7 +227,6 @@ __gconv_release_step (struct __gconv_step *step)\n }\n \n static int\n-internal_function\n gen_steps (struct derivation_step *best, const char *toset,\n \t   const char *fromset, struct __gconv_step **handle, size_t *nsteps)\n {\n@@ -370,7 +366,6 @@ gen_steps (struct derivation_step *best, const char *toset,\n \n #ifndef STATIC_GCONV\n static int\n-internal_function\n increment_counter (struct __gconv_step *steps, size_t nsteps)\n {\n   /* Increment the user counter.  */\n@@ -430,7 +425,6 @@ increment_counter (struct __gconv_step *steps, size_t nsteps)\n /* The main function: find a possible derivation from the `fromset' (either\n    the given name or the alias) to the `toset' (again with alias).  */\n static int\n-internal_function\n find_derivation (const char *toset, const char *toset_expand,\n \t\t const char *fromset, const char *fromset_expand,\n \t\t struct __gconv_step **handle, size_t *nsteps)\n@@ -710,7 +704,6 @@ do_lookup_alias (const char *name)\n \n \n int\n-internal_function\n __gconv_compare_alias (const char *name1, const char *name2)\n {\n   int result;\n@@ -727,7 +720,6 @@ __gconv_compare_alias (const char *name1, const char *name2)\n \n \n int\n-internal_function\n __gconv_find_transform (const char *toset, const char *fromset,\n \t\t\tstruct __gconv_step **handle, size_t *nsteps,\n \t\t\tint flags)\n@@ -793,7 +785,6 @@ __gconv_find_transform (const char *toset, const char *fromset,\n \n /* Release the entries of the modules list.  */\n int\n-internal_function\n __gconv_close_transform (struct __gconv_step *steps, size_t nsteps)\n {\n   int result = __GCONV_OK;\n@@ -822,7 +813,7 @@ __gconv_close_transform (struct __gconv_step *steps, size_t nsteps)\n \n /* Free the modules mentioned.  */\n static void\n-internal_function __libc_freeres_fn_section\n+__libc_freeres_fn_section\n free_modules_db (struct gconv_module *node)\n {\n   if (node->left != NULL)\ndiff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c\nindex d7dbba90a2..5feb88cac0 100644\n--- a/iconv/gconv_dl.c\n+++ b/iconv/gconv_dl.c\n@@ -64,7 +64,6 @@ known_compare (const void *p1, const void *p2)\n /* Open the gconv database if necessary.  A non-negative return value\n    means success.  */\n struct __gconv_loaded_object *\n-internal_function\n __gconv_find_shlib (const char *name)\n {\n   struct __gconv_loaded_object *found;\n@@ -183,7 +182,6 @@ do_release_shlib (void *nodep, VISIT value, int level)\n \n /* Notify system that a shared object is not longer needed.  */\n void\n-internal_function\n __gconv_release_shlib (struct __gconv_loaded_object *handle)\n {\n   /* Urgh, this is ugly but we have no other possibility.  */\ndiff --git a/iconv/gconv_int.h b/iconv/gconv_int.h\nindex 85a67ad31b..b1433f801e 100644\n--- a/iconv/gconv_int.h\n+++ b/iconv/gconv_int.h\n@@ -156,12 +156,10 @@ __libc_lock_define (extern, __gconv_lock attribute_hidden)\n \n /* Return in *HANDLE decriptor for transformation from FROMSET to TOSET.  */\n extern int __gconv_open (const char *toset, const char *fromset,\n-\t\t\t __gconv_t *handle, int flags)\n-     internal_function;\n+\t\t\t __gconv_t *handle, int flags);\n \n /* Free resources associated with transformation descriptor CD.  */\n-extern int __gconv_close (__gconv_t cd)\n-     internal_function;\n+extern int __gconv_close (__gconv_t cd);\n \n /* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF\n    according to rules described by CD and place up to *OUTBYTESLEFT\n@@ -169,37 +167,33 @@ extern int __gconv_close (__gconv_t cd)\n    conversions in *IRREVERSIBLE if this pointer is not null.  */\n extern int __gconv (__gconv_t cd, const unsigned char **inbuf,\n \t\t    const unsigned char *inbufend, unsigned char **outbuf,\n-\t\t    unsigned char *outbufend, size_t *irreversible)\n-     internal_function;\n+\t\t    unsigned char *outbufend, size_t *irreversible);\n \n /* Return in *HANDLE a pointer to an array with *NSTEPS elements describing\n    the single steps necessary for transformation from FROMSET to TOSET.  */\n extern int __gconv_find_transform (const char *toset, const char *fromset,\n \t\t\t\t   struct __gconv_step **handle,\n-\t\t\t\t   size_t *nsteps, int flags)\n-     internal_function;\n+\t\t\t\t   size_t *nsteps, int flags);\n \n /* Search for transformation in cache data.  */\n extern int __gconv_lookup_cache (const char *toset, const char *fromset,\n \t\t\t\t struct __gconv_step **handle, size_t *nsteps,\n-\t\t\t\t int flags)\n-     internal_function;\n+\t\t\t\t int flags);\n \n /* Compare the two name for whether they are after alias expansion the\n    same.  This function uses the cache and fails if none is\n    loaded.  */\n extern int __gconv_compare_alias_cache (const char *name1, const char *name2,\n-\t\t\t\t\tint *result) internal_function;\n+\t\t\t\t\tint *result);\n \n /* Free data associated with a step's structure.  */\n-extern void __gconv_release_step (struct __gconv_step *step)\n-     internal_function;\n+extern void __gconv_release_step (struct __gconv_step *step);\n \n /* Read all the configuration data and cache it.  */\n extern void __gconv_read_conf (void) attribute_hidden;\n \n /* Try to read module cache file.  */\n-extern int __gconv_load_cache (void) internal_function;\n+extern int __gconv_load_cache (void);\n \n /* Retrieve pointer to internal cache.  */\n extern void *__gconv_get_cache (void);\n@@ -211,7 +205,7 @@ extern struct gconv_module *__gconv_get_modules_db (void);\n extern void *__gconv_get_alias_db (void);\n \n /* Determine the directories we are looking in.  */\n-extern void __gconv_get_path (void) internal_function;\n+extern void __gconv_get_path (void);\n \n /* Comparison function to search alias.  */\n extern int __gconv_alias_compare (const void *p1, const void *p2)\n@@ -220,34 +214,28 @@ extern int __gconv_alias_compare (const void *p1, const void *p2)\n /* Clear reference to transformation step implementations which might\n    cause the code to be unloaded.  */\n extern int __gconv_close_transform (struct __gconv_step *steps,\n-\t\t\t\t    size_t nsteps)\n-     internal_function;\n+\t\t\t\t    size_t nsteps);\n \n /* Free all resources allocated for the transformation record when\n    using the cache.  */\n-extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)\n-     internal_function;\n+extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps);\n \n /* Load shared object named by NAME.  If already loaded increment reference\n    count.  */\n-extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name)\n-     internal_function;\n+extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name);\n \n /* Release shared object.  If no further reference is available unload\n    the object.  */\n-extern void __gconv_release_shlib (struct __gconv_loaded_object *handle)\n-     internal_function;\n+extern void __gconv_release_shlib (struct __gconv_loaded_object *handle);\n \n /* Fill STEP with information about builtin module with NAME.  */\n extern void __gconv_get_builtin_trans (const char *name,\n-\t\t\t\t       struct __gconv_step *step)\n-     internal_function;\n+\t\t\t\t       struct __gconv_step *step);\n \n libc_hidden_proto (__gconv_transliterate)\n \n /* If NAME is an codeset alias expand it.  */\n-extern int __gconv_compare_alias (const char *name1, const char *name2)\n-     internal_function;\n+extern int __gconv_compare_alias (const char *name1, const char *name2);\n \n \n /* Builtin transformations.  */\ndiff --git a/iconv/gconv_open.c b/iconv/gconv_open.c\nindex ff4fd121eb..d349527808 100644\n--- a/iconv/gconv_open.c\n+++ b/iconv/gconv_open.c\n@@ -27,7 +27,6 @@\n \n \n int\n-internal_function\n __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,\n \t      int flags)\n {\ndiff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c\nindex 1397d2e9bd..35d6eb3646 100644\n--- a/iconv/iconv_prog.c\n+++ b/iconv/iconv_prog.c\n@@ -113,7 +113,7 @@ static int process_fd (iconv_t cd, int fd, FILE **output,\n \t\t       const char *output_file);\n static int process_file (iconv_t cd, FILE *input, FILE **output,\n \t\t\t const char *output_file);\n-static void print_known_names (void) internal_function;\n+static void print_known_names (void);\n \n \n int\n@@ -712,7 +712,6 @@ do_print  (const void *nodep, VISIT value, int level)\n }\n \n static void\n-internal_function\n add_known_names (struct gconv_module *node)\n {\n   if (node->left != NULL)\n@@ -756,7 +755,6 @@ insert_cache (void)\n \n \n static void\n-internal_function\n print_known_names (void)\n {\n   iconv_t h;\ndiff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c\nindex 9be4111a42..9e5e7af87d 100644\n--- a/iconv/iconvconfig.c\n+++ b/iconv/iconvconfig.c\n@@ -566,7 +566,6 @@ new_module (const char *fromname, size_t fromlen, const char *toname,\n \n /* Add new module.  */\n static void\n-internal_function\n add_module (char *rp, const char *directory)\n {\n   /* We expect now\ndiff --git a/intl/dcigettext.c b/intl/dcigettext.c\nindex f63b34b0f5..80750f34ab 100644\n--- a/intl/dcigettext.c\n+++ b/intl/dcigettext.c\n@@ -347,18 +347,15 @@ struct binding *_nl_domain_bindings;\n /* Prototypes for local functions.  */\n static char *plural_lookup (struct loaded_l10nfile *domain,\n \t\t\t    unsigned long int n,\n-\t\t\t    const char *translation, size_t translation_len)\n-     internal_function;\n+\t\t\t    const char *translation, size_t translation_len);\n \n #ifdef IN_LIBGLOCALE\n static const char *guess_category_value (int category,\n \t\t\t\t\t const char *categoryname,\n-\t\t\t\t\t const char *localename)\n-     internal_function;\n+\t\t\t\t\t const char *localename);\n #else\n static const char *guess_category_value (int category,\n-\t\t\t\t\t const char *categoryname)\n-     internal_function;\n+\t\t\t\t\t const char *categoryname);\n #endif\n \n #ifdef _LIBC\n@@ -366,11 +363,10 @@ static const char *guess_category_value (int category,\n # define category_to_name(category) \\\n   _nl_category_names.str + _nl_category_name_idxs[category]\n #else\n-static const char *category_to_name (int category) internal_function;\n+static const char *category_to_name (int category);\n #endif\n #if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE\n-static const char *get_output_charset (struct binding *domainbinding)\n-     internal_function;\n+static const char *get_output_charset (struct binding *domainbinding);\n #endif\n \n \n@@ -868,7 +864,6 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,\n    in case of a memory allocation failure during conversion (only if\n    ENCODING != NULL resp. CONVERT == true).  */\n char *\n-internal_function\n #ifdef IN_LIBGLOCALE\n _nl_find_msg (struct loaded_l10nfile *domain_file,\n \t      struct binding *domainbinding, const char *encoding,\n@@ -1401,7 +1396,6 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,\n \n /* Look up a plural variant.  */\n static char *\n-internal_function\n plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,\n \t       const char *translation, size_t translation_len)\n {\n@@ -1439,7 +1433,6 @@ plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,\n #ifndef _LIBC\n /* Return string representation of locale CATEGORY.  */\n static const char *\n-internal_function\n category_to_name (int category)\n {\n   const char *retval;\n@@ -1500,7 +1493,6 @@ category_to_name (int category)\n /* Guess value of current locale from value of the environment variables\n    or system-dependent defaults.  */\n static const char *\n-internal_function\n #ifdef IN_LIBGLOCALE\n guess_category_value (int category, const char *categoryname,\n \t\t      const char *locale)\n@@ -1591,7 +1583,6 @@ guess_category_value (int category, const char *categoryname)\n #if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE\n /* Returns the output charset.  */\n static const char *\n-internal_function\n get_output_charset (struct binding *domainbinding)\n {\n   /* The output charset should normally be determined by the locale.  But\ndiff --git a/intl/eval-plural.h b/intl/eval-plural.h\nindex 664b809c2f..4bc6f445e7 100644\n--- a/intl/eval-plural.h\n+++ b/intl/eval-plural.h\n@@ -21,7 +21,6 @@\n /* Evaluate the plural expression and return an index value.  */\n STATIC\n unsigned long int\n-internal_function\n plural_eval (const struct expression *pexp, unsigned long int n)\n {\n   switch (pexp->nargs)\ndiff --git a/intl/finddomain.c b/intl/finddomain.c\nindex 88fd880dbc..78718b3fac 100644\n--- a/intl/finddomain.c\n+++ b/intl/finddomain.c\n@@ -55,7 +55,6 @@ static struct loaded_l10nfile *_nl_loaded_domains;\n    the DOMAINNAME and CATEGORY parameters with respect to the currently\n    established bindings.  */\n struct loaded_l10nfile *\n-internal_function\n _nl_find_domain (const char *dirname, char *locale,\n \t\t const char *domainname, struct binding *domainbinding)\n {\ndiff --git a/intl/gettextP.h b/intl/gettextP.h\nindex eeb8970852..8fcfb5bef8 100644\n--- a/intl/gettextP.h\n+++ b/intl/gettextP.h\n@@ -61,7 +61,7 @@ extern char *__bind_textdomain_codeset (const char *__domainname,\n \t\t\t\t\tconst char *__codeset);\n extern void _nl_finddomain_subfreeres (void) attribute_hidden;\n extern void _nl_unload_domain (struct loaded_domain *__domain)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n #else\n /* Declare the exported libintl_* functions, in a way that allows us to\n    call them under their real name.  */\n@@ -89,10 +89,6 @@ extern char *libintl_dcigettext (const char *__domainname,\n \n /* @@ end of prolog @@ */\n \n-#ifndef internal_function\n-# define internal_function\n-#endif\n-\n #ifndef attribute_hidden\n # define attribute_hidden\n #endif\n@@ -255,23 +251,19 @@ extern const char *_nl_locale_name_default (void);\n \n struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,\n \t\t\t\t\t const char *__domainname,\n-\t\t\t\t\t struct binding *__domainbinding)\n-     internal_function;\n+\t\t\t\t\t struct binding *__domainbinding);\n void _nl_load_domain (struct loaded_l10nfile *__domain,\n-\t\t      struct binding *__domainbinding)\n-     internal_function;\n+\t\t      struct binding *__domainbinding);\n \n #ifdef IN_LIBGLOCALE\n char *_nl_find_msg (struct loaded_l10nfile *domain_file,\n \t\t    struct binding *domainbinding, const char *encoding,\n \t\t    const char *msgid,\n-\t\t    size_t *lengthp)\n-     internal_function;\n+\t\t    size_t *lengthp);\n #else\n char *_nl_find_msg (struct loaded_l10nfile *domain_file,\n \t\t    struct binding *domainbinding, const char *msgid,\n-\t\t    int convert, size_t *lengthp)\n-     internal_function;\n+\t\t    int convert, size_t *lengthp);\n #endif\n \n /* The internal variables in the standalone libintl.a must have different\ndiff --git a/intl/loadinfo.h b/intl/loadinfo.h\nindex 602ee8213f..38dbc31f43 100644\n--- a/intl/loadinfo.h\n+++ b/intl/loadinfo.h\n@@ -30,10 +30,6 @@\n    in gettextP.h.\n  */\n \n-#ifndef internal_function\n-# define internal_function\n-#endif\n-\n #ifndef LIBINTL_DLL_EXPORTED\n # define LIBINTL_DLL_EXPORTED\n #endif\ndiff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c\nindex 13e2f2a573..e8b2314225 100644\n--- a/intl/loadmsgcat.c\n+++ b/intl/loadmsgcat.c\n@@ -749,7 +749,6 @@ get_sysdep_segment_value (const char *name)\n /* Load the message catalogs specified by FILENAME.  If it is no valid\n    message catalog do nothing.  */\n void\n-internal_function\n _nl_load_domain (struct loaded_l10nfile *domain_file,\n \t\t struct binding *domainbinding)\n {\n@@ -1285,7 +1284,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,\n \n #ifdef _LIBC\n void\n-internal_function __libc_freeres_fn_section\n+__libc_freeres_fn_section\n _nl_unload_domain (struct loaded_domain *domain)\n {\n   size_t i;\ndiff --git a/intl/localealias.c b/intl/localealias.c\nindex 9921aa2825..08662f78cc 100644\n--- a/intl/localealias.c\n+++ b/intl/localealias.c\n@@ -88,10 +88,6 @@ char *alloca ();\n # include \"lock.h\"\n #endif\n \n-#ifndef internal_function\n-# define internal_function\n-#endif\n-\n /* Some optimizations for glibc.  */\n #ifdef _LIBC\n # define FEOF(fp)\t\tfeof_unlocked (fp)\n@@ -143,8 +139,7 @@ static size_t maxmap;\n \n \n /* Prototypes for local functions.  */\n-static size_t read_alias_file (const char *fname, int fname_len)\n-     internal_function;\n+static size_t read_alias_file (const char *fname, int fname_len);\n static int extend_alias_table (void);\n static int alias_compare (const struct alias_map *map1,\n \t\t\t  const struct alias_map *map2);\n@@ -212,7 +207,6 @@ _nl_expand_alias (const char *name)\n \n \n static size_t\n-internal_function\n read_alias_file (const char *fname, int fname_len)\n {\n   FILE *fp;\ndiff --git a/intl/plural-exp.c b/intl/plural-exp.c\nindex f3a45fa92e..8c15032631 100644\n--- a/intl/plural-exp.c\n+++ b/intl/plural-exp.c\n@@ -94,7 +94,6 @@ init_germanic_plural (void)\n #endif\n \n void\n-internal_function\n EXTRACT_PLURAL_EXPRESSION (const char *nullentry,\n \t\t\t   const struct expression **pluralp,\n \t\t\t   unsigned long int *npluralsp)\ndiff --git a/intl/plural-exp.h b/intl/plural-exp.h\nindex 144aa1ed4b..4833fcdf35 100644\n--- a/intl/plural-exp.h\n+++ b/intl/plural-exp.h\n@@ -18,10 +18,6 @@\n #ifndef _PLURAL_EXP_H\n #define _PLURAL_EXP_H\n \n-#ifndef internal_function\n-# define internal_function\n-#endif\n-\n #ifndef attribute_hidden\n # define attribute_hidden\n #endif\n@@ -105,14 +101,12 @@ struct parse_args\n # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression\n #endif\n \n-extern void FREE_EXPRESSION (struct expression *exp)\n-     internal_function;\n+extern void FREE_EXPRESSION (struct expression *exp);\n extern int PLURAL_PARSE (struct parse_args *arg);\n extern const struct expression GERMANIC_PLURAL attribute_hidden;\n extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,\n \t\t\t\t       const struct expression **pluralp,\n-\t\t\t\t       unsigned long int *npluralsp)\n-     internal_function;\n+\t\t\t\t       unsigned long int *npluralsp);\n \n #if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)\n extern unsigned long int plural_eval (const struct expression *pexp,\ndiff --git a/intl/plural.c b/intl/plural.c\nindex c2aa7d7d02..73a71633f1 100644\n--- a/intl/plural.c\n+++ b/intl/plural.c\n@@ -1836,7 +1836,6 @@ yyreturn:\n \n \n void\n-internal_function\n FREE_EXPRESSION (struct expression *exp)\n {\n   if (exp == NULL)\ndiff --git a/intl/plural.y b/intl/plural.y\nindex 5f945659d5..78a7453f4c 100644\n--- a/intl/plural.y\n+++ b/intl/plural.y\n@@ -207,7 +207,6 @@ exp:\t  exp '?' exp ':' exp\n %%\n \n void\n-internal_function\n FREE_EXPRESSION (struct expression *exp)\n {\n   if (exp == NULL)\ndiff --git a/locale/coll-lookup.c b/locale/coll-lookup.c\nindex a4deb9c0da..349265f041 100644\n--- a/locale/coll-lookup.c\n+++ b/locale/coll-lookup.c\n@@ -20,7 +20,6 @@\n \n /* Lookup in a table of int32_t, with default value 0.  */\n int32_t\n-internal_function\n __collidx_table_lookup (const char *table, uint32_t wc)\n {\n   uint32_t shift1 = ((const uint32_t *) table)[0];\n@@ -51,7 +50,6 @@ __collidx_table_lookup (const char *table, uint32_t wc)\n \n /* Lookup in a table of uint32_t, with default value 0xffffffff.  */\n uint32_t\n-internal_function\n __collseq_table_lookup (const char *table, uint32_t wc)\n {\n   uint32_t shift1 = ((const uint32_t *) table)[0];\ndiff --git a/locale/coll-lookup.h b/locale/coll-lookup.h\nindex d95408ad68..d1c488dcf5 100644\n--- a/locale/coll-lookup.h\n+++ b/locale/coll-lookup.h\n@@ -19,9 +19,7 @@\n #include <stdint.h>\n \n /* Lookup in a table of int32_t, with default value 0.  */\n-extern int32_t __collidx_table_lookup (const char *table, uint32_t wc)\n-     internal_function;\n+extern int32_t __collidx_table_lookup (const char *table, uint32_t wc);\n \n /* Lookup in a table of uint32_t, with default value 0xffffffff.  */\n-extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc)\n-     internal_function;\n+extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc);\ndiff --git a/locale/findlocale.c b/locale/findlocale.c\nindex 02a97ac654..60029604d5 100644\n--- a/locale/findlocale.c\n+++ b/locale/findlocale.c\n@@ -99,7 +99,6 @@ valid_locale_name (const char *name)\n }\n \n struct __locale_data *\n-internal_function\n _nl_find_locale (const char *locale_path, size_t locale_path_len,\n \t\t int category, const char **name)\n {\n@@ -332,7 +331,6 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,\n /* Calling this function assumes the lock for handling global locale data\n    is acquired.  */\n void\n-internal_function\n _nl_remove_locale (int locale, struct __locale_data *data)\n {\n   if (--data->usage_count == 0)\ndiff --git a/locale/loadarchive.c b/locale/loadarchive.c\nindex 158cf14af8..ebbac6ad65 100644\n--- a/locale/loadarchive.c\n+++ b/locale/loadarchive.c\n@@ -130,7 +130,6 @@ calculate_head_size (const struct locarhead *h)\n    structure.  If successful, sets *NAMEP to point directly into the mapped\n    archive string table; that way, the next call can short-circuit strcmp.  */\n struct __locale_data *\n-internal_function\n _nl_load_locale_from_archive (int category, const char **namep)\n {\n   const char *name = *namep;\ndiff --git a/locale/loadlocale.c b/locale/loadlocale.c\nindex 24ad671ead..2bdb39b4b8 100644\n--- a/locale/loadlocale.c\n+++ b/locale/loadlocale.c\n@@ -61,7 +61,6 @@ static const enum value_type *const _nl_value_types[] =\n \n \n struct __locale_data *\n-internal_function\n _nl_intern_locale_data (int category, const void *data, size_t datasize)\n {\n   const struct\n@@ -160,7 +159,6 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize)\n }\n \n void\n-internal_function\n _nl_load_locale (struct loaded_l10nfile *file, int category)\n {\n   int fd;\n@@ -282,7 +280,6 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)\n }\n \n void\n-internal_function\n _nl_unload_locale (struct __locale_data *locale)\n {\n   if (locale->private.cleanup)\ndiff --git a/locale/localeinfo.h b/locale/localeinfo.h\nindex 4e1c8c568a..06f01d90de 100644\n--- a/locale/localeinfo.h\n+++ b/locale/localeinfo.h\n@@ -63,7 +63,7 @@ struct __locale_data\n      the data.  */\n   struct\n   {\n-    void (*cleanup) (struct __locale_data *) internal_function;\n+    void (*cleanup) (struct __locale_data *);\n     union\n     {\n       void *data;\n@@ -336,19 +336,18 @@ extern const char _nl_default_locale_path[] attribute_hidden;\n extern struct __locale_data *_nl_find_locale (const char *locale_path,\n \t\t\t\t\t      size_t locale_path_len,\n \t\t\t\t\t      int category, const char **name)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n \n /* Try to load the file described by FILE.  */\n extern void _nl_load_locale (struct loaded_l10nfile *file, int category)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n \n /* Free all resource.  */\n-extern void _nl_unload_locale (struct __locale_data *locale)\n-     internal_function attribute_hidden;\n+extern void _nl_unload_locale (struct __locale_data *locale) attribute_hidden;\n \n /* Free the locale and give back all memory if the usage count is one.  */\n extern void _nl_remove_locale (int locale, struct __locale_data *data)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n \n /* Find the locale *NAMEP in the locale archive, and return the\n    internalized data structure for its CATEGORY data.  If this locale has\n@@ -357,7 +356,7 @@ extern void _nl_remove_locale (int locale, struct __locale_data *data)\n    archive string table; that way, the next call can short-circuit strcmp.  */\n extern struct __locale_data *_nl_load_locale_from_archive (int category,\n \t\t\t\t\t\t\t   const char **namep)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n \n /* Subroutine of setlocale's __libc_subfreeres hook.  */\n extern void _nl_archive_subfreeres (void) attribute_hidden;\n@@ -373,40 +372,39 @@ extern void _nl_locale_subfreeres (void) attribute_hidden;\n extern struct __locale_data *_nl_intern_locale_data (int category,\n \t\t\t\t\t\t     const void *data,\n \t\t\t\t\t\t     size_t datasize)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n \n \n /* Return `era' entry which corresponds to TP.  Used in strftime.  */\n extern struct era_entry *_nl_get_era_entry (const struct tm *tp,\n \t\t\t\t\t    struct __locale_data *lc_time)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n \n /* Return `era' cnt'th entry .  Used in strptime.  */\n extern struct era_entry *_nl_select_era_entry (int cnt,\n \t\t\t\t\t       struct __locale_data *lc_time)\n-\t  internal_function attribute_hidden;\n+\t  attribute_hidden;\n \n /* Return `alt_digit' which corresponds to NUMBER.  Used in strftime.  */\n extern const char *_nl_get_alt_digit (unsigned int number,\n \t\t\t\t      struct __locale_data *lc_time)\n-\t  internal_function attribute_hidden;\n+\t  attribute_hidden;\n \n /* Similar, but now for wide characters.  */\n extern const wchar_t *_nl_get_walt_digit (unsigned int number,\n \t\t\t\t\t  struct __locale_data *lc_time)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n \n /* Parse string as alternative digit and return numeric value.  */\n extern int _nl_parse_alt_digit (const char **strp,\n \t\t\t\tstruct __locale_data *lc_time)\n-     internal_function attribute_hidden;\n+     attribute_hidden;\n \n /* Postload processing.  */\n extern void _nl_postload_ctype (void);\n \n /* Functions used for the `private.cleanup' hook.  */\n-extern void _nl_cleanup_time (struct __locale_data *)\n-     internal_function attribute_hidden;\n+extern void _nl_cleanup_time (struct __locale_data *) attribute_hidden;\n \n \n #endif\t/* localeinfo.h */\ndiff --git a/time/alt_digit.c b/time/alt_digit.c\nindex e3bcea4414..7047fa3415 100644\n--- a/time/alt_digit.c\n+++ b/time/alt_digit.c\n@@ -69,7 +69,6 @@ _nl_init_alt_digit (struct __locale_data *current)\n }\n \n const char *\n-internal_function\n _nl_get_alt_digit (unsigned int number, struct __locale_data *current)\n {\n   const char *result;\n@@ -95,7 +94,6 @@ _nl_get_alt_digit (unsigned int number, struct __locale_data *current)\n \n \n const wchar_t *\n-internal_function\n _nl_get_walt_digit (unsigned int number, struct __locale_data *current)\n {\n   const wchar_t *result = NULL;\n@@ -148,7 +146,6 @@ _nl_get_walt_digit (unsigned int number, struct __locale_data *current)\n \n \n int\n-internal_function\n _nl_parse_alt_digit (const char **strp, struct __locale_data *current)\n {\n   const char *str = *strp;\ndiff --git a/time/era.c b/time/era.c\nindex b5743c621a..934844de31 100644\n--- a/time/era.c\n+++ b/time/era.c\n@@ -35,7 +35,7 @@ __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden)\n \n /* Look up the era information in CURRENT's locale strings and\n    cache it in CURRENT->private.  */\n-static void internal_function\n+static void\n _nl_init_era_entries (struct __locale_data *current)\n {\n   size_t cnt;\n@@ -139,7 +139,6 @@ _nl_init_era_entries (struct __locale_data *current)\n }\n \n struct era_entry *\n-internal_function\n _nl_get_era_entry (const struct tm *tp, struct __locale_data *current)\n {\n   if (current->private.time == NULL || !current->private.time->era_initialized)\n@@ -166,7 +165,6 @@ _nl_get_era_entry (const struct tm *tp, struct __locale_data *current)\n \n \n struct era_entry *\n-internal_function\n _nl_select_era_entry (int cnt, struct __locale_data *current)\n {\n   if (current->private.time == NULL || !current->private.time->era_initialized)\ndiff --git a/time/lc-time-cleanup.c b/time/lc-time-cleanup.c\nindex 92b5be5818..9db9232575 100644\n--- a/time/lc-time-cleanup.c\n+++ b/time/lc-time-cleanup.c\n@@ -19,7 +19,7 @@\n #include \"../locale/localeinfo.h\"\n #include <stdlib.h>\n \n-void internal_function\n+void\n _nl_cleanup_time (struct __locale_data *locale)\n {\n   struct lc_time_data *const data = locale->private.time;\ndiff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c\nindex 656cc0a8e8..ccafc11222 100644\n--- a/wcsmbs/wcsmbsload.c\n+++ b/wcsmbs/wcsmbsload.c\n@@ -148,7 +148,6 @@ __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden)\n \n /* Load conversion functions for the currently selected locale.  */\n void\n-internal_function\n __wcsmbs_load_conv (struct __locale_data *new_category)\n {\n   /* Acquire the lock.  */\n@@ -215,7 +214,6 @@ __wcsmbs_load_conv (struct __locale_data *new_category)\n \n /* Clone the current conversion function set.  */\n void\n-internal_function\n __wcsmbs_clone_conv (struct gconv_fcts *copy)\n {\n   const struct gconv_fcts *orig;\n@@ -236,7 +234,6 @@ __wcsmbs_clone_conv (struct gconv_fcts *copy)\n \n /* Get converters for named charset.  */\n int\n-internal_function\n __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)\n {\n   copy->towc = __wcsmbs_getfct (\"INTERNAL\", name, &copy->towc_nsteps);\n@@ -253,7 +250,7 @@ __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)\n   return 0;\n }\n \n-void internal_function\n+void\n _nl_cleanup_ctype (struct __locale_data *locale)\n {\n   const struct gconv_fcts *const data = locale->private.ctype;\ndiff --git a/wcsmbs/wcsmbsload.h b/wcsmbs/wcsmbsload.h\nindex 3e254a877e..7efe2c1f81 100644\n--- a/wcsmbs/wcsmbsload.h\n+++ b/wcsmbs/wcsmbsload.h\n@@ -37,20 +37,16 @@ struct gconv_fcts\n extern const struct gconv_fcts __wcsmbs_gconv_fcts_c attribute_hidden;\n \n /* Load conversion functions for the currently selected locale.  */\n-extern void __wcsmbs_load_conv (struct __locale_data *new_category)\n-     internal_function;\n+extern void __wcsmbs_load_conv (struct __locale_data *new_category);\n \n /* Clone the current `__wcsmbs_load_conv' value.  */\n-extern void __wcsmbs_clone_conv (struct gconv_fcts *copy)\n-     internal_function;\n+extern void __wcsmbs_clone_conv (struct gconv_fcts *copy);\n \n /* Find the conversion functions for converting to and from NAME.  */\n-extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)\n-     internal_function;\n+extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name);\n \n /* Function used for the `private.cleanup' hook.  */\n-extern void _nl_cleanup_ctype (struct __locale_data *)\n-     internal_function attribute_hidden;\n+extern void _nl_cleanup_ctype (struct __locale_data *) attribute_hidden;\n \n \n #include <iconv/gconv_int.h>\n","prefixes":["COMMITTED"]}