From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 23 Jun 1999 10:48:34 +0000 (+0000)
Subject: Update from main branch.
X-Git-Tag: cvs/glibc_2-1-2~366
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec8c77a5ba61139e9b7da16dee263f32747e32af;p=thirdparty%2Fglibc.git

Update from main branch.
---

diff --git a/stdio/fputc.c b/stdio/fputc.c
index 754b4f95473..4d7de7063f9 100644
--- 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 f92ef303b86..f35f9775bfd 100644
--- 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)