From 2d80400a9e8454038a3ec29959436184be0c4c65 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 20 Aug 2014 12:14:21 -0700 Subject: [PATCH] Fix some 32-bit-isms in . Bug: 17157793 Change-Id: I8290e240b92e5617f4c12c0eacad6e622e677b6a --- libc/include/stdio.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libc/include/stdio.h b/libc/include/stdio.h index 9c6bd3f94..43b0fbfe4 100644 --- a/libc/include/stdio.h +++ b/libc/include/stdio.h @@ -58,10 +58,17 @@ typedef off_t fpos_t; /* stdio file position type */ */ /* stdio buffers */ +#if defined(__LP64__) +struct __sbuf { + unsigned char* _base; + size_t _size; +}; +#else struct __sbuf { unsigned char *_base; int _size; }; +#endif /* * stdio state variables. @@ -94,8 +101,13 @@ typedef struct __sFILE { unsigned char *_p; /* current position in (some) buffer */ int _r; /* read space left for getc() */ 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 _file; /* fileno, if Unix descriptor, else -1 */ +#endif struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */ int _lbfsize; /* 0 or -_bf._size, for inline putc */ -- 2.11.0