* stdio-common/printf_fp.c (__printf_fp): Add prototype for nested

function. 
* elf/dl-load.c (_dl_map_object_from_fd): Likewise. 
* locale/programs/locale.c (show_locale_vars): Likewise. 
(show_info): Likewise. 
* locale/programs/ld-collate.c (collate_output): Likewise. 
* locale/programs/ld-ctype.c (set_class_defaults): Likewise. 
* elf/dl-deps.c (_dl_map_object_deps): Likewise. 
* stdlib/rpmatch.c (rpmatch): Likewise.

7 files changed, 19 insertions, 1 deletions

diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index c9997310ba..df1db89796 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -142,6 +142,8 @@ _dl_map_object_deps (struct link_map *map,
   struct list *runp, *utail, *dtail;
   unsigned int nlist, nduplist, i;
 
+  auto inline void preload (struct link_map *map);
+
   inline void preload (struct link_map *map)
     {
       known[nlist].done = 0;
diff --git a/elf/dl-load.c b/elf/dl-load.c
index f42cb61ea3..24ac6f018a 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -750,6 +750,9 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
 {
   struct link_map *l = NULL;
 
+  auto inline caddr_t map_segment (ElfW(Addr) mapstart, size_t len,
+				   int prot, int fixed, off_t offset);
+
   inline caddr_t map_segment (ElfW(Addr) mapstart, size_t len,
 			      int prot, int fixed, off_t offset)
     {
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index aee2daaa69..b228834eaa 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -2240,6 +2240,8 @@ collate_output (struct localedef_t *locale, struct charmap_t *charmap,
      the table.  In case we have more than one sequence starting with
      the same byte we have to use extra indirection.  */
   {
+    auto void add_to_tablewc (uint32_t ch, struct element_t *runp);
+
     void add_to_tablewc (uint32_t ch, struct element_t *runp)
       {
 	if (runp->wcnext == NULL && runp->nwcs == 1)
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index a5bf63f71d..fd427f162e 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -2876,6 +2876,8 @@ set_class_defaults (struct locale_ctype_t *ctype, struct charmap_t *charmap,
      It may seem that the order of these if-blocks is arbitrary but it is NOT.
      Don't move them unless you know what you do!  */
 
+  auto void set_default (int bitpos, int from, int to);
+
   void set_default (int bitpos, int from, int to)
     {
       char tmp[2];
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 4d63441cea..823be8d8fe 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -501,6 +501,8 @@ show_locale_vars (void)
   const char *lcall = getenv ("LC_ALL");
   const char *lang = getenv ("LANG") ? : "POSIX";
 
+  auto void get_source (const char *name);
+
   void get_source (const char *name)
     {
       char *val = getenv (name);
@@ -530,6 +532,8 @@ show_info (const char *name)
 {
   size_t cat_no;
 
+  auto void print_item (struct cat_item *item);
+
   void print_item (struct cat_item *item)
     {
       switch (item->value_type)
@@ -634,7 +638,7 @@ show_info (const char *name)
 	     information is available in a multibyte string.  */
 	default:
 	  break;
-	  
+
 	}
     }
 
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 0f598d87ef..dc5f47dc99 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -200,6 +200,8 @@ __printf_fp (FILE *fp,
   /* Nonzero if this is output on a wide character stream.  */
   int wide = info->wide;
 
+  auto wchar_t hack_digit (void);
+
   wchar_t hack_digit (void)
     {
       mp_limb_t hi;
diff --git a/stdlib/rpmatch.c b/stdlib/rpmatch.c
index 31fd471944..cb8e7ae370 100644
--- a/stdlib/rpmatch.c
+++ b/stdlib/rpmatch.c
@@ -29,6 +29,9 @@ rpmatch (response)
 {
   /* Match against one of the response patterns, compiling the pattern
      first if necessary.  */
+  auto inline int try (const int tag, const int match, const int nomatch,
+		       const char **lastp, regex_t *re);
+
   inline int try (const int tag, const int match, const int nomatch,
 		  const char **lastp, regex_t *re)
     {