diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-07-04 17:17:09 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-07-04 17:17:09 +0300 |
| commit | cc78bdc31749e9754120ae5a9d4849f4832b40a4 (patch) | |
| tree | 4f9e3f2064e56651ed8d41ae9d8ce8b08fc5241b /lib/freadptr.c | |
| parent | 8425beb209e6fedf50bcdd934ced14dfa0d7b596 (diff) | |
| parent | 71cd8e3a743046573744123777061b64881bf372 (diff) | |
| download | coreutils-cc78bdc31749e9754120ae5a9d4849f4832b40a4.tar.gz | |
Merge tag 'upstream/8.24'
Upstream version 8.24
Conflicts:
INSTALL
Makefile.in
aclocal.m4
build-aux/config.guess
build-aux/config.rpath
build-aux/config.sub
build-aux/depcomp
build-aux/missing
build-aux/test-driver
build-aux/texinfo.tex
doc/coreutils.info
doc/stamp-vti
doc/version.texi
gnulib-tests/Makefile.in
po/Makefile.in.in
Diffstat (limited to 'lib/freadptr.c')
| -rw-r--r-- | lib/freadptr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/freadptr.c b/lib/freadptr.c index 26c66ede..818c7ee6 100644 --- a/lib/freadptr.c +++ b/lib/freadptr.c @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,7 +37,8 @@ freadptr (FILE *fp, size_t *sizep) return NULL; *sizep = size; return (const char *) fp->_IO_read_ptr; -#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) return NULL; size = fp_->_r; |