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/iofsetpos.c | |
parent | 2004eeba8fb2a92105bbf95b280fff6dc1d84144 (diff) | |
parent | 4cbfda396f7cd9e83116c28965ade73d80c1cb82 (diff) |
Merge commit 'refs/top-bases/t/ONSTACK' into t/ONSTACK
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 |