diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:23:01 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:23:01 +0000 |
| commit | 519f6620457d9f84d0125c0c7d01abebaae8efaa (patch) | |
| tree | 28e2b20214b72aa7a633a5910dba7d2388620a78 /libio/getchar.c | |
| parent | 74f331b3ccf81cf9404be03e62bde9efcc0878c2 (diff) | |
| parent | 68e2fa8ed9dbf0edfdaed0310801e764c12af46e (diff) | |
Merge commit 'refs/top-bases/t/libc_cleanup' into t/libc_cleanup
Diffstat (limited to 'libio/getchar.c')
| -rw-r--r-- | libio/getchar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libio/getchar.c b/libio/getchar.c index db1b6e3698..0e3f4153c8 100644 --- a/libio/getchar.c +++ b/libio/getchar.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 @@ -33,13 +33,15 @@ int getchar (void) { int result; + if (!_IO_need_lock (_IO_stdin)) + return _IO_getc_unlocked (_IO_stdin); _IO_acquire_lock (_IO_stdin); result = _IO_getc_unlocked (_IO_stdin); _IO_release_lock (_IO_stdin); return result; } -#if defined weak_alias && !defined _IO_MTSAFE_IO +#ifndef _IO_MTSAFE_IO #undef getchar_unlocked weak_alias (getchar, getchar_unlocked) #endif |