diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:30:36 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:30:36 +0000 |
| commit | 704e05ff173885df6d1d27f381604429f27fd4de (patch) | |
| tree | fc67caec36bc5ed0c4190cafd38f69850a10ca0a /libio/ioungetc.c | |
| parent | ecfe3e291f848cf598309d746619de62ea88fabb (diff) | |
| parent | 3fcbb67b7949a8b362de5558bf1c6dd7ec5d21cf (diff) | |
Merge branch 't/tls-threadvar' into refs/top-bases/t/ONSTACK
Diffstat (limited to 'libio/ioungetc.c')
| -rw-r--r-- | libio/ioungetc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libio/ioungetc.c b/libio/ioungetc.c index 093af744b4..59ebb06177 100644 --- a/libio/ioungetc.c +++ b/libio/ioungetc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993-2016 Free Software Foundation, Inc. +/* Copyright (C) 1993-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 @@ -27,18 +27,18 @@ #include "libioP.h" int -_IO_ungetc (int c, _IO_FILE *fp) +_IO_ungetc (int c, FILE *fp) { int result; CHECK_FILE (fp, EOF); if (c == EOF) return EOF; + if (!_IO_need_lock (fp)) + return _IO_sputbackc (fp, (unsigned char) c); _IO_acquire_lock (fp); result = _IO_sputbackc (fp, (unsigned char) c); _IO_release_lock (fp); return result; } -#ifdef weak_alias weak_alias (_IO_ungetc, ungetc) -#endif |