diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:26:46 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:26:46 +0000 |
| commit | df6d86d8822458cf787b5f5620490d6a962da3b8 (patch) | |
| tree | 8d499fa24a32a195bd6e384dfb70639c45c4a9bb /libio/oldfmemopen.c | |
| parent | 2c7242b971fd7b63fa842df15ec6fa3d0ff8aeb0 (diff) | |
| parent | 1949a12d5da678a8532359a95717d8e63910d93b (diff) | |
Merge commit 'refs/top-bases/t/____longjmp_chk' into t/____longjmp_chkt/____longjmp_chk
Diffstat (limited to 'libio/oldfmemopen.c')
| -rw-r--r-- | libio/oldfmemopen.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libio/oldfmemopen.c b/libio/oldfmemopen.c index 2678a5d6be..d7f0db3423 100644 --- a/libio/oldfmemopen.c +++ b/libio/oldfmemopen.c @@ -1,5 +1,5 @@ /* Fmemopen implementation. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Hanno Mueller, kontakt@hanno.de, 2000. @@ -71,7 +71,6 @@ #if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_22) #include <errno.h> -#include <libio.h> #include <stdio.h> #include <stdlib.h> #include <stdint.h> @@ -86,7 +85,7 @@ struct fmemopen_cookie_struct int mybuffer; int binmode; size_t size; - _IO_off64_t pos; + off64_t pos; size_t maxpos; }; @@ -150,9 +149,9 @@ fmemopen_write (void *cookie, const char *b, size_t s) static int -fmemopen_seek (void *cookie, _IO_off64_t *p, int w) +fmemopen_seek (void *cookie, off64_t *p, int w) { - _IO_off64_t np; + off64_t np; fmemopen_cookie_t *c; c = (fmemopen_cookie_t *) cookie; |