diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:56:13 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:57:13 +0000 |
| commit | 82dd75a7f436a19047325d62182590c9f9e23a78 (patch) | |
| tree | 60ca20c8cf2b0d178d84725c0715471f76df97e1 /libio/getc.c | |
| parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'libio/getc.c')
| -rw-r--r-- | libio/getc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libio/getc.c b/libio/getc.c index 434367c7e5..dd925232d5 100644 --- a/libio/getc.c +++ b/libio/getc.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 @@ -34,6 +34,8 @@ _IO_getc (FILE *fp) { int result; CHECK_FILE (fp, EOF); + if (!_IO_need_lock (fp)) + return _IO_getc_unlocked (fp); _IO_acquire_lock (fp); result = _IO_getc_unlocked (fp); _IO_release_lock (fp); @@ -42,7 +44,6 @@ _IO_getc (FILE *fp) #undef getc -#ifdef weak_alias weak_alias (_IO_getc, getc) weak_alias (_IO_getc, fgetc) @@ -51,4 +52,3 @@ weak_alias (_IO_getc, fgetc) weak_alias (_IO_getc, getc_unlocked) weak_alias (_IO_getc, fgetc_unlocked) #endif -#endif |