am ab4c4686: am 7fdde4a5: Merge "Expose __srefill for LP64 until we can fix the NDK."

* commit 'ab4c46863d32daf6ed5c98a101317c0108071c1d':
  Expose __srefill for LP64 until we can fix the NDK.
This commit is contained in:
Elliott Hughes 2014-05-28 09:15:56 +00:00 committed by Android Git Automerger
commit 44445f2d51

View File

@ -54,7 +54,9 @@ __LIBC_HIDDEN__ int __swbuf(int, FILE*);
* The NDK apparently includes an android_support.a library that
* refers to __srefill in its copy of the vsnprintf implementation.
*/
__LIBC_HIDDEN__ int __srefill(FILE*);
/* TODO(LP64): __LIBC_HIDDEN__ int __srefill(FILE*);*/
/* http://b/15291317: the LP64 NDK needs to be fixed to remove that cruft. */
__LIBC_ABI_PUBLIC__ int __srefill(FILE*);
#else
__LIBC_ABI_PUBLIC__ int __srget(FILE*);
__LIBC_ABI_PUBLIC__ int __swbuf(int, FILE*);