diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-03 15:41:57 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-02-03 15:41:57 -0800 |
| commit | 8d60cc63163df81938305632e1b7474aeda17d52 (patch) | |
| tree | da12d1c2995aeeea5d08107025b76c31f28aaa6e /libc | |
| parent | fb4da1e7b749b4cf6843515517e839efa1ee24c7 (diff) | |
| download | bionic-8d60cc63163df81938305632e1b7474aeda17d52.zip bionic-8d60cc63163df81938305632e1b7474aeda17d52.tar.gz bionic-8d60cc63163df81938305632e1b7474aeda17d52.tar.bz2 | |
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
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/include/sys/cdefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h index b4dad74..9fa62df 100644 --- a/libc/include/sys/cdefs.h +++ b/libc/include/sys/cdefs.h @@ -546,7 +546,7 @@ #define __bos0(s) __builtin_object_size((s), 0) #define __BIONIC_FORTIFY_INLINE \ - extern inline \ + extern __inline__ \ __attribute__ ((always_inline)) \ __attribute__ ((gnu_inline)) #endif |