summaryrefslogtreecommitdiff
path: root/libio/ferror.c
diff options
context:
space:
mode:
Diffstat (limited to 'libio/ferror.c')
-rw-r--r--libio/ferror.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libio/ferror.c b/libio/ferror.c
index daf02f85f4..4b5122b6af 100644
--- a/libio/ferror.c
+++ b/libio/ferror.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_ferror (_IO_FILE *fp)
+_IO_ferror (FILE *fp)
{
int result;
CHECK_FILE (fp, EOF);
+ if (!_IO_need_lock (fp))
+ return _IO_ferror_unlocked (fp);
_IO_flockfile (fp);
result = _IO_ferror_unlocked (fp);
_IO_funlockfile (fp);
return result;
}
-#ifdef weak_alias
weak_alias (_IO_ferror, ferror)
#ifndef _IO_MTSAFE_IO
#undef ferror_unlocked
weak_alias (_IO_ferror, ferror_unlocked)
#endif
-#endif