generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 2d80400a: Fix some 32-bit-isms in <stdio.h>.

Browse Source 
* commit '2d80400a9e8454038a3ec29959436184be0c4c65':
  Fix some 32-bit-isms in <stdio.h>.
This commit is contained in:
Elliott Hughes
2014-08-21 18:25:59 +00:00
committed by Android Git Automerger
parent 1fa71e6cbb 2d80400a9e
commit d00ce65a16
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libc/include/stdio.h
View File

@@ -66,10 +66,17 @@ typedef off_t fpos_t; /* stdio file position type */
*/ */
/* stdio buffers */ /* stdio buffers */
#if defined(__LP64__)
struct __sbuf {
unsigned char* _base;
size_t _size;
};
#else
struct __sbuf { struct __sbuf {
unsigned char *_base; unsigned char *_base;
int _size; int _size;
}; };
#endif
/* /*
* stdio state variables. * stdio state variables.
@@ -102,8 +109,13 @@ typedef struct __sFILE {
unsigned char *_p; /* current position in (some) buffer */ unsigned char *_p; /* current position in (some) buffer */
int _r; /* read space left for getc() */ int _r; /* read space left for getc() */
int _w; /* write space left for putc() */ int _w; /* write space left for putc() */
#if defined(__LP64__)
int _flags; /* flags, below; this FILE is free if 0 */
int _file; /* fileno, if Unix descriptor, else -1 */
#else
short _flags; /* flags, below; this FILE is free if 0 */ short _flags; /* flags, below; this FILE is free if 0 */
short _file; /* fileno, if Unix descriptor, else -1 */ short _file; /* fileno, if Unix descriptor, else -1 */
#endif
struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */ struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */
int _lbfsize; /* 0 or -_bf._size, for inline putc */ int _lbfsize; /* 0 or -_bf._size, for inline putc */