diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:41:39 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:41:39 +0000 |
| commit | 16c9ca827cd735002dec5689f93f22fc358d6f56 (patch) | |
| tree | fbfaa8e020a3a762a96c4f219d4150e369e00099 /libio/iofsetpos.c | |
| parent | daa262720d3dc357a298b18a359551994082c9b3 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/bits_atomic.h_multiple_threads' into t/bits_atomic.h_multiple_threadst/bits_atomic.h_multiple_threads
Diffstat (limited to 'libio/iofsetpos.c')
| -rw-r--r-- | libio/iofsetpos.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libio/iofsetpos.c b/libio/iofsetpos.c index ca5104b8cd..da48b27c3b 100644 --- a/libio/iofsetpos.c +++ b/libio/iofsetpos.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 @@ -29,17 +29,19 @@ complain about the mismatch when we do the alias below. */ #define _IO_new_fsetpos64 __renamed__IO_new_fsetpos64 #define _IO_fsetpos64 __renamed__IO_fsetpos64 +#define fsetpos64 __renamed_fsetpos64 #include <libioP.h> #undef _IO_new_fsetpos64 #undef _IO_fsetpos64 +#undef fsetpos64 #include <errno.h> #include <shlib-compat.h> int -_IO_new_fsetpos (_IO_FILE *fp, const _IO_fpos_t *posp) +_IO_new_fsetpos (FILE *fp, const __fpos_t *posp) { int result; CHECK_FILE (fp, EOF); @@ -49,10 +51,8 @@ _IO_new_fsetpos (_IO_FILE *fp, const _IO_fpos_t *posp) { /* ANSI explicitly requires setting errno to a positive value on failure. */ -#ifdef EIO if (errno == 0) __set_errno (EIO); -#endif result = EOF; } else |