* include/wchar.h (putwc): Use libc_hidden_proto.

	* include/stdio.h (dprintf, fprintf, vfprintf, sprintf,
	sscanf, fwrite, perror, remove, rewind, open_memstream): Likewise.
	* stdio-common/dprintf.c: Add libc_hidden_def.
	* stdio-common/fprintf.c: Likewise.
	* stdio-common/sprintf.c: Likewise.
	* stdio-common/sscanf.c: Likewise.
	* libio/iofwrite.c: Likewise.
	* libio/memstream.c: Likewise.
	* libio/putwc.c: Likewise.
	* stdio-common/perror.c: Likewise.
	* sysdeps/posix/remove.c: Likewise.
	* sysdeps/generic/remove.c: Likewise.
	* libio/rewind.c: Likewise.  Use <stdio.h> instead of "stdio.h".
	* stdio-common/vfprintf.c: Add libc_hidden_def.  Include <stdio.h>.

15 files changed, 51 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 144ab85e87..9da755dd07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2002-08-10  Roland McGrath  <roland@redhat.com>
+
+	* include/wchar.h (putwc): Use libc_hidden_proto.
+	* include/stdio.h (dprintf, fprintf, vfprintf, sprintf,
+	sscanf, fwrite, perror, remove, rewind, open_memstream): Likewise.
+	* stdio-common/dprintf.c: Add libc_hidden_def.
+	* stdio-common/fprintf.c: Likewise.
+	* stdio-common/sprintf.c: Likewise.
+	* stdio-common/sscanf.c: Likewise.
+	* libio/iofwrite.c: Likewise.
+	* libio/memstream.c: Likewise.
+	* libio/putwc.c: Likewise.
+	* stdio-common/perror.c: Likewise.
+	* sysdeps/posix/remove.c: Likewise.
+	* sysdeps/generic/remove.c: Likewise.
+	* libio/rewind.c: Likewise.  Use <stdio.h> instead of "stdio.h".
+	* stdio-common/vfprintf.c: Add libc_hidden_def.  Include <stdio.h>.
+
 2002-08-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* include/bits/dlfcn.h: New file.
diff --git a/include/stdio.h b/include/stdio.h
index 671f8eaf4f..63e49f0969 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -90,6 +90,15 @@ extern int _IO_new_fgetpos __P ((_IO_FILE *, _IO_fpos_t *));
 #   define fgetpos(fp, posp) _IO_new_fgetpos (fp, posp)
 #  endif
 
+libc_hidden_proto (dprintf)
+libc_hidden_proto (fprintf)
+libc_hidden_proto (vfprintf)
+libc_hidden_proto (sprintf)
+libc_hidden_proto (sscanf)
+libc_hidden_proto (fwrite)
+libc_hidden_proto (perror)
+libc_hidden_proto (remove)
+libc_hidden_proto (rewind)
 libc_hidden_proto (fileno)
 libc_hidden_proto (fwrite)
 libc_hidden_proto (fseek)
@@ -98,6 +107,7 @@ libc_hidden_proto (fread_unlocked)
 libc_hidden_proto (fwrite_unlocked)
 libc_hidden_proto (fgets_unlocked)
 libc_hidden_proto (fputs_unlocked)
+libc_hidden_proto (open_memstream)
 
 # endif
 
diff --git a/include/wchar.h b/include/wchar.h
index 9094ce12a8..7d3de19421 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -16,6 +16,7 @@ libc_hidden_proto (__wcsncasecmp_l)
 
 libc_hidden_proto (fputws_unlocked)
 libc_hidden_proto (putwc_unlocked)
+libc_hidden_proto (putwc)
 
 libc_hidden_proto (vswscanf)
 
diff --git a/libio/iofwrite.c b/libio/iofwrite.c
index 9a4016f06e..47c166cf22 100644
--- a/libio/iofwrite.c
+++ b/libio/iofwrite.c
@@ -53,8 +53,9 @@ _IO_fwrite (buf, size, count, fp)
 INTDEF(_IO_fwrite)
 
 #ifdef weak_alias
+# include <stdio.h>
 weak_alias (_IO_fwrite, fwrite)
-
+libc_hidden_weak (fwrite)
 # ifndef _IO_MTSAFE_IO
 weak_alias (_IO_fwrite, fwrite_unlocked)
 # endif
diff --git a/libio/memstream.c b/libio/memstream.c
index ad31390633..a3ec964237 100644
--- a/libio/memstream.c
+++ b/libio/memstream.c
@@ -124,6 +124,7 @@ open_memstream (bufloc, sizeloc)
 
   return (_IO_FILE *) &new_f->fp._sf._sbf;
 }
+libc_hidden_def (open_memstream)
 
 
 static int
diff --git a/libio/putwc.c b/libio/putwc.c
index 3fbef87b5e..33da712f7f 100644
--- a/libio/putwc.c
+++ b/libio/putwc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96,97,98,99,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -33,3 +33,4 @@ putwc (wc, fp)
   _IO_cleanup_region_end (0);
   return result;
 }
+libc_hidden_def (putwc)
diff --git a/libio/rewind.c b/libio/rewind.c
index 91bcdf15f5..e1bdc571e0 100644
--- a/libio/rewind.c
+++ b/libio/rewind.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1993,96,97,98,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
    in files containing the exception.  */
 
 #include "libioP.h"
-#include "stdio.h"
+#include <stdio.h>
 
 void
 rewind (fp)
@@ -40,3 +40,4 @@ rewind (fp)
   _IO_funlockfile (fp);
   _IO_cleanup_region_end (0);
 }
+libc_hidden_def (rewind)
diff --git a/stdio-common/dprintf.c b/stdio-common/dprintf.c
index 13aa7f04f8..534b3f0df7 100644
--- a/stdio-common/dprintf.c
+++ b/stdio-common/dprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,97,98,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -38,3 +38,4 @@ dprintf (int d, const char *format, ...)
 
   return done;
 }
+libc_hidden_def (dprintf)
diff --git a/stdio-common/fprintf.c b/stdio-common/fprintf.c
index 3da65b6b50..9243a4ec02 100644
--- a/stdio-common/fprintf.c
+++ b/stdio-common/fprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,6 +34,7 @@ fprintf (FILE *stream, const char *format, ...)
 
   return done;
 }
+libc_hidden_def (fprintf)
 
 #ifdef USE_IN_LIBIO
 /* We define the function with the real name here.  But deep down in
diff --git a/stdio-common/perror.c b/stdio-common/perror.c
index 6a4e3494ed..9899c7d509 100644
--- a/stdio-common/perror.c
+++ b/stdio-common/perror.c
@@ -90,3 +90,4 @@ perror (const char *s)
   perror_internal (stderr, s, errnum);
 #endif
 }
+libc_hidden_def (perror)
diff --git a/stdio-common/sprintf.c b/stdio-common/sprintf.c
index f44a24b2b6..07e2654993 100644
--- a/stdio-common/sprintf.c
+++ b/stdio-common/sprintf.c
@@ -38,6 +38,7 @@ sprintf (char *s, const char *format, ...)
 
   return done;
 }
+libc_hidden_def (sprintf)
 
 #ifdef USE_IN_LIBIO
 strong_alias(sprintf, _IO_sprintf)
diff --git a/stdio-common/sscanf.c b/stdio-common/sscanf.c
index cd876a0410..26d8742d09 100644
--- a/stdio-common/sscanf.c
+++ b/stdio-common/sscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96,98,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -40,6 +40,7 @@ sscanf (s, format)
 
   return done;
 }
+libc_hidden_def (sscanf)
 
 #ifdef USE_IN_LIBIO
 # undef _IO_sscanf
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index ec30aba7e4..21368e1aab 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -29,6 +29,7 @@
 #include <sys/param.h>
 #include "_itoa.h"
 #include <locale/localeinfo.h>
+#include <stdio.h>
 
 /* This code is shared between the standard stdio implementation found
    in GNU C library and the libio implementation originally found in
@@ -104,7 +105,6 @@
 # endif
 #else /* ! USE_IN_LIBIO */
 /* This code is for use in the GNU C library.  */
-# include <stdio.h>
 # define ARGCHECK(S, Format) \
   do									      \
     {									      \
@@ -2264,6 +2264,7 @@ strong_alias (_IO_vfwprintf, __vfwprintf);
 weak_alias (_IO_vfwprintf, vfwprintf);
 #  else
 strong_alias (_IO_vfprintf, vfprintf);
+libc_hidden_def (vfprintf)
 INTDEF(_IO_vfprintf)
 #  endif
 # else
diff --git a/sysdeps/generic/remove.c b/sysdeps/generic/remove.c
index e4922cf2df..5dc0e9edf0 100644
--- a/sysdeps/generic/remove.c
+++ b/sysdeps/generic/remove.c
@@ -1,5 +1,5 @@
 /* ANSI C `remove' function to delete a file or directory.  Stub version.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,6 +27,7 @@ remove (file)
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (remove)
 
 stub_warning (remove)
 #include <stub-tag.h>
diff --git a/sysdeps/posix/remove.c b/sysdeps/posix/remove.c
index 487b8c905d..7473ee14f4 100644
--- a/sysdeps/posix/remove.c
+++ b/sysdeps/posix/remove.c
@@ -1,5 +1,5 @@
 /* ANSI C `remove' function to delete a file or directory.  POSIX.1 version.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -38,3 +38,4 @@ remove (file)
 
   return -1;
 }
+libc_hidden_def (remove)