diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:33:27 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:33:27 +0000 |
commit | 064374be911f72dfaec8a75f06da1f9fc1827712 (patch) | |
tree | ad96fd1f1b9b57a50005db7803f6b79e748bb820 /libio/ioseekoff.c | |
parent | 4dc1e6e42f1f602e1d2227e112f2db8dce9da763 (diff) | |
parent | 7c7d34a16f08f84427b3f617313d9633423ad5eb (diff) |
Merge commit 'refs/top-bases/t/hurdsig-global-dispositions' into t/hurdsig-global-dispositions
Diffstat (limited to 'libio/ioseekoff.c')
-rw-r--r-- | libio/ioseekoff.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libio/ioseekoff.c b/libio/ioseekoff.c index 05d90bbeec..773cdc672d 100644 --- a/libio/ioseekoff.c +++ b/libio/ioseekoff.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 @@ -27,15 +27,9 @@ #include <stdlib.h> #include <libioP.h> #include <errno.h> -#ifndef errno -extern int errno; -#endif -#ifndef __set_errno -# define __set_errno(Val) errno = (Val) -#endif -_IO_off64_t -_IO_seekoff_unlocked (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) +off64_t +_IO_seekoff_unlocked (FILE *fp, off64_t offset, int dir, int mode) { if (dir != _IO_seek_cur && dir != _IO_seek_set && dir != _IO_seek_end) { @@ -66,10 +60,10 @@ _IO_seekoff_unlocked (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) } -_IO_off64_t -_IO_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) +off64_t +_IO_seekoff (FILE *fp, off64_t offset, int dir, int mode) { - _IO_off64_t retval; + off64_t retval; _IO_acquire_lock (fp); retval = _IO_seekoff_unlocked (fp, offset, dir, mode); |