diff options
| -rw-r--r-- | libc/private/bionic_name_mem.h | 2 | ||||
| -rw-r--r-- | libc/stdio/local.h | 9 | ||||
| -rw-r--r-- | libc/upstream-freebsd/android/include/namespace.h | 2 | ||||
| -rw-r--r-- | libc/upstream-netbsd/android/include/namespace.h | 3 | ||||
| -rw-r--r-- | libc/upstream-openbsd/android/include/openbsd-compat.h | 16 |
5 files changed, 17 insertions, 15 deletions
diff --git a/libc/private/bionic_name_mem.h b/libc/private/bionic_name_mem.h index 98716f4..1c7664e 100644 --- a/libc/private/bionic_name_mem.h +++ b/libc/private/bionic_name_mem.h @@ -34,7 +34,7 @@ __BEGIN_DECLS -int __bionic_name_mem(void* addr, size_t len, const char* name); +__LIBC_HIDDEN__ int __bionic_name_mem(void* addr, size_t len, const char* name); __END_DECLS diff --git a/libc/stdio/local.h b/libc/stdio/local.h index 151e009..4511a71 100644 --- a/libc/stdio/local.h +++ b/libc/stdio/local.h @@ -49,14 +49,7 @@ */ __LIBC_HIDDEN__ int __srget(FILE*); __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. - */ -/* 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*); +__LIBC_HIDDEN__ int __srefill(FILE*); #else __LIBC_ABI_PUBLIC__ int __srget(FILE*); __LIBC_ABI_PUBLIC__ int __swbuf(int, FILE*); diff --git a/libc/upstream-freebsd/android/include/namespace.h b/libc/upstream-freebsd/android/include/namespace.h index a980b57..a3f850e 100644 --- a/libc/upstream-freebsd/android/include/namespace.h +++ b/libc/upstream-freebsd/android/include/namespace.h @@ -17,6 +17,4 @@ #ifndef _BIONIC_FREEBSD_NAMESPACE_H_included #define _BIONIC_FREEBSD_NAMESPACE_H_included -__attribute__((visibility("hidden"))) char* _mktemp(char*); - #endif diff --git a/libc/upstream-netbsd/android/include/namespace.h b/libc/upstream-netbsd/android/include/namespace.h index a4d4151..5df543c 100644 --- a/libc/upstream-netbsd/android/include/namespace.h +++ b/libc/upstream-netbsd/android/include/namespace.h @@ -22,4 +22,7 @@ #undef __weak_alias #endif +__LIBC_HIDDEN__ int __res_enable_mt(void); +__LIBC_HIDDEN__ int __res_disable_mt(void); + #endif diff --git a/libc/upstream-openbsd/android/include/openbsd-compat.h b/libc/upstream-openbsd/android/include/openbsd-compat.h index cf63907..5827a82 100644 --- a/libc/upstream-openbsd/android/include/openbsd-compat.h +++ b/libc/upstream-openbsd/android/include/openbsd-compat.h @@ -37,9 +37,17 @@ #define issetugid() 0 /* LP32 NDK ctype.h contained references to these. */ -__LIBC64_HIDDEN__ extern const short *_tolower_tab_; -__LIBC64_HIDDEN__ extern const short *_toupper_tab_; - -__LIBC_HIDDEN__ extern struct atexit *__atexit; +__LIBC64_HIDDEN__ extern const short* _tolower_tab_; +__LIBC64_HIDDEN__ extern const short* _toupper_tab_; + +__LIBC_HIDDEN__ extern struct atexit* __atexit; +__LIBC_HIDDEN__ extern const char _C_ctype_[]; +__LIBC_HIDDEN__ extern const short _C_toupper_[]; +__LIBC_HIDDEN__ extern const short _C_tolower_[]; +__LIBC_HIDDEN__ extern char* __findenv(const char*, int, int*); +__LIBC_HIDDEN__ extern char* _mktemp(char*); + +/* TODO: hide this when android_support.a is fixed (http://b/16298580).*/ +/*__LIBC_HIDDEN__*/ extern int __isthreaded; #endif |