Re: prototypes for nested functions

[Andreas Jaeger <aj at suse dot de>]

>>>>> Ulrich Drepper writes:

 > Andreas Jaeger <aj@suse.de> writes:
>> What do you think of the appended patch?  Shall I send a similar
>> version for all nested functions to shut up GCC?

 > If it works, sure.

It works for me ;-) (with gcc 2.97 CVS current and with 2.95.2 also).

I'm appending a complete patch that I'll commit soonish,
Andreas

2000-12-27  Andreas Jaeger  <aj@suse.de>

	* 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.

============================================================
Index: elf/dl-deps.c
--- elf/dl-deps.c	2000/10/24 19:04:17	1.50
+++ elf/dl-deps.c	2000/12/27 19:32:21
@@ -142,6 +142,8 @@
   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;
============================================================
Index: elf/dl-load.c
--- elf/dl-load.c	2000/12/08 17:26:51	1.154
+++ elf/dl-load.c	2000/12/27 19:32:23
@@ -750,6 +750,9 @@
 {
   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)
     {
============================================================
Index: locale/programs/ld-ctype.c
--- locale/programs/ld-ctype.c	2000/12/10 16:12:26	1.94
+++ locale/programs/ld-ctype.c	2000/12/27 19:32:27
@@ -2876,6 +2876,8 @@
      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];
============================================================
Index: locale/programs/ld-collate.c
--- locale/programs/ld-collate.c	2000/12/17 17:06:32	1.89
+++ locale/programs/ld-collate.c	2000/12/27 19:32:30
@@ -2240,6 +2240,8 @@
      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)
============================================================
Index: locale/programs/locale.c
--- locale/programs/locale.c	2000/12/17 17:06:32	1.36
+++ locale/programs/locale.c	2000/12/27 19:32:30
@@ -501,6 +501,8 @@
   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 @@
 {
   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 @@
 	     information is available in a multibyte string.  */
 	default:
 	  break;
-	  
+
 	}
     }
 
============================================================
Index: stdio-common/printf_fp.c
--- stdio-common/printf_fp.c	2000/12/06 20:58:05	1.43
+++ stdio-common/printf_fp.c	2000/12/27 19:32:32
@@ -200,6 +200,8 @@
   /* 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;

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj