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

Merge "Expose __swsetup for LP32 binary compatibility."

Browse Source
This commit is contained in:
Elliott Hughes 2014-09-12 01:27:44 +00:00 committed by Gerrit Code Review
commit 8d8a789c49
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libc/stdio/local.h
View File

@ -41,20 +41,17 @@
#include "wcio.h" #include "wcio.h"
#include "fileext.h" #include "fileext.h"
#if defined(__LP64__)
/* /*
* Android <= KitKat had getc/putc macros in <stdio.h> that referred * Android <= KitKat had getc/putc macros in <stdio.h> that referred
* to __srget/__swbuf, so those symbols need to be public for LP32 * to __srget/__swbuf, so those symbols need to be public for LP32
* but can be hidden for LP64. * but can be hidden for LP64.
*/ */
__LIBC_HIDDEN__ int __srget(FILE*); __LIBC64_HIDDEN__ int __srget(FILE*);
__LIBC_HIDDEN__ int __swbuf(int, FILE*); __LIBC64_HIDDEN__ int __swbuf(int, FILE*);
__LIBC_HIDDEN__ int __srefill(FILE*); __LIBC64_HIDDEN__ int __srefill(FILE*);
#else
__LIBC_ABI_PUBLIC__ int __srget(FILE*); /* This was referenced by the apportable middleware for LP32. */
__LIBC_ABI_PUBLIC__ int __swbuf(int, FILE*); __LIBC64_HIDDEN__ int __swsetup(FILE*);
__LIBC_ABI_PUBLIC__ int __srefill(FILE*);
#endif
#pragma GCC visibility push(hidden) #pragma GCC visibility push(hidden)
@ -70,7 +67,6 @@ void _cleanup(void);
void __smakebuf(FILE *); void __smakebuf(FILE *);
int __swhatbuf(FILE *, size_t *, int *); int __swhatbuf(FILE *, size_t *, int *);
int _fwalk(int (*)(FILE *)); int _fwalk(int (*)(FILE *));
int __swsetup(FILE *);
int __sflags(const char *, int *); int __sflags(const char *, int *);
wint_t __fgetwc_unlock(FILE *); wint_t __fgetwc_unlock(FILE *);
wint_t __ungetwc(wint_t, FILE *); wint_t __ungetwc(wint_t, FILE *);