Update from main branch.

diff --git a/stdio/fputc.c b/stdio/fputc.c
index 754b4f95473747db6619ec7c708d54d7d7fd51c9..4d7de7063f921bf1ccaed49822dc39ef78f5bb1f 100644 (file)
--- a/stdio/fputc.c
+++ b/stdio/fputc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 1999 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
@@ -35,4 +35,6 @@ fputc (c, stream)
   return __putc (c, stream);
 }
 
+#ifndef fputc
 weak_alias (fputc, fputc_unlocked)
+#endif

diff --git a/stdio/putc.c b/stdio/putc.c
index f92ef303b86a271e24a53c334495382bbbf89cdc..f35f9775bfd844fd0e9fa977b94dcecd1f1c9b33 100644 (file)
--- a/stdio/putc.c
+++ b/stdio/putc.c
@@ -3,3 +3,4 @@
 #define        fputc   putc
 #define fputc_unlocked putc_unlocked
 #include <fputc.c>
+weak_alias (putc, putc_unlocked)