summaryrefslogtreecommitdiff
path: root/libio/putc.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 15:26:46 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 15:26:46 +0000
commitdf6d86d8822458cf787b5f5620490d6a962da3b8 (patch)
tree8d499fa24a32a195bd6e384dfb70639c45c4a9bb /libio/putc.c
parent2c7242b971fd7b63fa842df15ec6fa3d0ff8aeb0 (diff)
parent1949a12d5da678a8532359a95717d8e63910d93b (diff)
Merge commit 'refs/top-bases/t/____longjmp_chk' into t/____longjmp_chkt/____longjmp_chk
Diffstat (limited to 'libio/putc.c')
-rw-r--r--libio/putc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libio/putc.c b/libio/putc.c
index fd233917b3..13570f579b 100644
--- a/libio/putc.c
+++ b/libio/putc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2018 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
@@ -21,10 +21,12 @@
#undef _IO_putc
int
-_IO_putc (int c, _IO_FILE *fp)
+_IO_putc (int c, FILE *fp)
{
int result;
CHECK_FILE (fp, EOF);
+ if (!_IO_need_lock (fp))
+ return _IO_putc_unlocked (c, fp);
_IO_acquire_lock (fp);
result = _IO_putc_unlocked (c, fp);
_IO_release_lock (fp);
@@ -34,11 +36,9 @@ libc_hidden_def (_IO_putc)
#undef putc
-#ifdef weak_alias
weak_alias (_IO_putc, putc)
#ifndef _IO_MTSAFE_IO
#undef putc_unlocked
weak_alias (_IO_putc, putc_unlocked)
#endif
-#endif