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/oldiofgetpos64.c | |
parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'libio/oldiofgetpos64.c')
-rw-r--r-- | libio/oldiofgetpos64.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libio/oldiofgetpos64.c b/libio/oldiofgetpos64.c index d4e4861056..e542dbfd52 100644 --- a/libio/oldiofgetpos64.c +++ b/libio/oldiofgetpos64.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 @@ -32,9 +32,9 @@ int attribute_compat_text_section -_IO_old_fgetpos64 (_IO_FILE *fp, _IO_fpos64_t *posp) +_IO_old_fgetpos64 (FILE *fp, __fpos64_t *posp) { - _IO_off64_t pos; + off64_t pos; CHECK_FILE (fp, EOF); _IO_acquire_lock (fp); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); @@ -45,20 +45,16 @@ _IO_old_fgetpos64 (_IO_FILE *fp, _IO_fpos64_t *posp) { /* ANSI explicitly requires setting errno to a positive value on failure. */ -#ifdef EIO if (errno == 0) __set_errno (EIO); -#endif return EOF; } posp->__pos = pos; return 0; } -#ifdef weak_alias compat_symbol (libc, _IO_old_fgetpos64, _IO_fgetpos64, GLIBC_2_1); strong_alias (_IO_old_fgetpos64, __old_fgetpos64) compat_symbol (libc, __old_fgetpos64, fgetpos64, GLIBC_2_1); -#endif #endif |