am 2d94ee29: Merge "Revert "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64."""

* commit '2d94ee29f4be528167f1de328226cac259aac738':
  Revert "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64.""
This commit is contained in:
Dan Albert 2014-07-07 16:20:11 +00:00 committed by Android Git Automerger
commit 731f927313
3 changed files with 13 additions and 2 deletions

View File

@ -56,8 +56,6 @@
__BEGIN_DECLS __BEGIN_DECLS
extern const char *_ctype_; extern const char *_ctype_;
extern const short *_tolower_tab_;
extern const short *_toupper_tab_;
#if defined(__GNUC__) || defined(_ANSI_LIBRARY) || defined(lint) #if defined(__GNUC__) || defined(_ANSI_LIBRARY) || defined(lint)
int isalnum(int); int isalnum(int);

View File

@ -64,6 +64,13 @@
/* Used to tag non-static symbols that are private and never exposed by the shared library. */ /* Used to tag non-static symbols that are private and never exposed by the shared library. */
#define __LIBC_HIDDEN__ __attribute__((visibility ("hidden"))) #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. */ /* Used to tag non-static symbols that are public and exposed by the shared library. */
#define __LIBC_ABI_PUBLIC__ __attribute__((visibility ("default"))) #define __LIBC_ABI_PUBLIC__ __attribute__((visibility ("default")))

View File

@ -17,6 +17,8 @@
#ifndef _BIONIC_OPENBSD_COMPAT_H_included #ifndef _BIONIC_OPENBSD_COMPAT_H_included
#define _BIONIC_OPENBSD_COMPAT_H_included #define _BIONIC_OPENBSD_COMPAT_H_included
#include <sys/cdefs.h>
#define __USE_BSD #define __USE_BSD
/* OpenBSD's <ctype.h> uses these names, which conflicted with stlport. /* OpenBSD's <ctype.h> uses these names, which conflicted with stlport.
@ -34,4 +36,8 @@
/* OpenBSD has this, but we can't really implement it correctly on Linux. */ /* OpenBSD has this, but we can't really implement it correctly on Linux. */
#define issetugid() 0 #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 #endif