diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:31:37 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:31:37 +0000 |
| commit | 74a412373b66a38b6ce8156f027ce26f89a7462f (patch) | |
| tree | a59ce0af7ffd48641ca9124d697f7a6b57b26931 /libio/feof.c | |
| parent | 2004eeba8fb2a92105bbf95b280fff6dc1d84144 (diff) | |
| parent | 4cbfda396f7cd9e83116c28965ade73d80c1cb82 (diff) | |
Merge commit 'refs/top-bases/t/ONSTACK' into t/ONSTACK
Diffstat (limited to 'libio/feof.c')
| -rw-r--r-- | libio/feof.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libio/feof.c b/libio/feof.c index 8de54e6495..cf9b7eee42 100644 --- a/libio/feof.c +++ b/libio/feof.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 @@ -28,21 +28,21 @@ #include "stdio.h" int -_IO_feof (_IO_FILE *fp) +_IO_feof (FILE *fp) { int result; CHECK_FILE (fp, EOF); + if (!_IO_need_lock (fp)) + return _IO_feof_unlocked (fp); _IO_flockfile (fp); result = _IO_feof_unlocked (fp); _IO_funlockfile (fp); return result; } -#ifdef weak_alias weak_alias (_IO_feof, feof) #ifndef _IO_MTSAFE_IO #undef feof_unlocked weak_alias (_IO_feof, feof_unlocked) #endif -#endif |