summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6487f0d)
raw | patch | inline | side by side (parent: 6487f0d)
author | Elliott Hughes <enh@google.com> | |
Thu, 11 Sep 2014 23:41:11 +0000 (16:41 -0700) | ||
committer | Elliott Hughes <enh@google.com> | |
Fri, 12 Sep 2014 01:23:46 +0000 (18:23 -0700) |
(cherry-pick of 7e00b44e80d6e38b8ab86d0ebc86b666c0ac2ef6.)
Bug: 17476127
Change-Id: I0ef1355ac913d782c268a638f88642d6cfc236c2
Bug: 17476127
Change-Id: I0ef1355ac913d782c268a638f88642d6cfc236c2
libc/stdio/local.h | patch | blob | history |
diff --git a/libc/stdio/local.h b/libc/stdio/local.h
index 4511a71dabb07c7633c4fb341be2cdc22ffedc28..d777deccbdfcee92fb56ac8355c377bfda16094c 100644 (file)
--- a/libc/stdio/local.h
+++ b/libc/stdio/local.h
#include "wcio.h"
#include "fileext.h"
-#if defined(__LP64__)
/*
* 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.
*/
-__LIBC_HIDDEN__ int __srget(FILE*);
-__LIBC_HIDDEN__ int __swbuf(int, FILE*);
-__LIBC_HIDDEN__ int __srefill(FILE*);
-#else
-__LIBC_ABI_PUBLIC__ int __srget(FILE*);
-__LIBC_ABI_PUBLIC__ int __swbuf(int, FILE*);
-__LIBC_ABI_PUBLIC__ int __srefill(FILE*);
-#endif
+__LIBC64_HIDDEN__ int __srget(FILE*);
+__LIBC64_HIDDEN__ int __swbuf(int, FILE*);
+__LIBC64_HIDDEN__ int __srefill(FILE*);
+
+/* This was referenced by the apportable middleware for LP32. */
+__LIBC64_HIDDEN__ int __swsetup(FILE*);
#pragma GCC visibility push(hidden)
void __smakebuf(FILE *);
int __swhatbuf(FILE *, size_t *, int *);
int _fwalk(int (*)(FILE *));
-int __swsetup(FILE *);
int __sflags(const char *, int *);
wint_t __fgetwc_unlock(FILE *);
wint_t __ungetwc(wint_t, FILE *);