Use __inline__ for fortify.

libunwind has #define inline /* empty */ which breaks our fortified headers.
glibc uses __inline but our BSD-derived headers often override that. __inline__
is the third alternative understood by GCC that -- as far as I know -- neither
the C library itself nor third-party code tries to mess with.

Bug: 12871594
Change-Id: I6677e70ea531bb7d4c46021b43af760d4ad8ecf7
This commit is contained in:
Elliott Hughes 2014-02-03 15:41:57 -08:00
parent fb4da1e7b7
commit 8d60cc6316

View file

@ -546,7 +546,7 @@
#define __bos0(s) __builtin_object_size((s), 0) #define __bos0(s) __builtin_object_size((s), 0)
#define __BIONIC_FORTIFY_INLINE \ #define __BIONIC_FORTIFY_INLINE \
extern inline \ extern __inline__ \
__attribute__ ((always_inline)) \ __attribute__ ((always_inline)) \
__attribute__ ((gnu_inline)) __attribute__ ((gnu_inline))
#endif #endif