diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:06:20 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:06:58 +0000 |
| commit | 3fcbb67b7949a8b362de5558bf1c6dd7ec5d21cf (patch) | |
| tree | b867f9a6d3426f212b2f073bef8067a830f13022 /libio/feof.c | |
| parent | b6df7ac2cbe11e6a72f2ab7bd35c6130b72d21d9 (diff) | |
| parent | cab56836b146bc129f1ad43f0393d95a9deca63a (diff) | |
Merge commit 'refs/top-bases/t/tls-threadvar' into t/tls-threadvar
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 |