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

Restore __srget and __swbuf for LP32.

Browse Source 
Anthony King <anthonydking@slimroms.net> reports that for Grouper the
Nvidia GL blobs need access to __swbuf. This is because the old <stdio.h>
had inline getc and putc implementations that directly referred to these
symbols.

Change-Id: I11a7b5550018ecc93d8f195c99857759669b2906
This commit is contained in:
Elliott Hughes 2014-05-25 10:38:25 -07:00
parent 255789e4d1
commit 35d90bb6ec
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libc/stdio/local.h
View File

@ -41,6 +41,18 @@
#include "wcio.h"
#include "fileext.h"
/* Android <= KitKat had getc/putc macros in <stdio.h> that referred
* to __srget/__swbuf, so those symbols need to be public for LP32
* but can be hidden for LP64.
*/
#if defined(__LP64__)
__LIBC_HIDDEN__ int __srget(FILE*);
__LIBC_HIDDEN__ int __swbuf(int, FILE*);
#else
__LIBC_ABI_PUBLIC__ int __srget(FILE*);
__LIBC_ABI_PUBLIC__ int __swbuf(int, FILE*);
#endif
#pragma GCC visibility push(hidden)
int __sflush(FILE *);
@ -104,10 +116,8 @@ extern int __sdidinit;
#define NO_PRINTF_PERCENT_N
/* OpenBSD exposes these in <stdio.h>, but we only want them exposed to the implementation. */
__BEGIN_DECLS
int __srget(FILE*);
int __swbuf(int, FILE*);
__END_DECLS
#define __sfeof(p) (((p)->_flags & __SEOF) != 0)
#define __sferror(p) (((p)->_flags & __SERR) != 0)
#define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF)))