am 6ff66601: am ce4a5cd5: am 8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""

* commit '6ff66601a47d7b74544310e4a5535d572e23d68e':
  Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
This commit is contained in:
Shih-wei Liao 2012-08-06 10:20:48 -07:00 committed by Android Git Automerger
commit 42bfbd1e61

View File

@ -502,18 +502,11 @@
#include <android/api-level.h> #include <android/api-level.h>
#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
#if defined(__clang__)
#define __BIONIC_FORTIFY_INLINE \
extern inline \
__attribute__ ((always_inline)) \
__attribute__ ((artificial))
#else
#define __BIONIC_FORTIFY_INLINE \ #define __BIONIC_FORTIFY_INLINE \
extern inline \ extern inline \
__attribute__ ((always_inline)) \ __attribute__ ((always_inline)) \
__attribute__ ((gnu_inline)) \ __attribute__ ((gnu_inline)) \
__attribute__ ((artificial)) __attribute__ ((artificial))
#endif
#define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1) #define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1)
#endif #endif