Merge "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64.""
This commit is contained in:
commit
0df59bd3a5
3 changed files with 2 additions and 13 deletions
|
@ -56,6 +56,8 @@
|
|||
__BEGIN_DECLS
|
||||
|
||||
extern const char *_ctype_;
|
||||
extern const short *_tolower_tab_;
|
||||
extern const short *_toupper_tab_;
|
||||
|
||||
#if defined(__GNUC__) || defined(_ANSI_LIBRARY) || defined(lint)
|
||||
int isalnum(int);
|
||||
|
|
|
@ -64,13 +64,6 @@
|
|||
/* Used to tag non-static symbols that are private and never exposed by the shared library. */
|
||||
#define __LIBC_HIDDEN__ __attribute__((visibility ("hidden")))
|
||||
|
||||
/* Like __LIBC_HIDDEN__, but preserves binary compatibility for LP32. */
|
||||
#ifdef __LP64__
|
||||
#define __LIBC64_HIDDEN__ __LIBC_HIDDEN__
|
||||
#else
|
||||
#define __LIBC64_HIDDEN__
|
||||
#endif
|
||||
|
||||
/* Used to tag non-static symbols that are public and exposed by the shared library. */
|
||||
#define __LIBC_ABI_PUBLIC__ __attribute__((visibility ("default")))
|
||||
|
||||
|
|
|
@ -17,8 +17,6 @@
|
|||
#ifndef _BIONIC_OPENBSD_COMPAT_H_included
|
||||
#define _BIONIC_OPENBSD_COMPAT_H_included
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
#define __USE_BSD
|
||||
|
||||
/* OpenBSD's <ctype.h> uses these names, which conflicted with stlport.
|
||||
|
@ -36,8 +34,4 @@
|
|||
/* OpenBSD has this, but we can't really implement it correctly on Linux. */
|
||||
#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_;
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue