diff options
| author | Elliott Hughes <enh@google.com> | 2018-07-24 12:45:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-24 12:45:06 -0700 |
| commit | f34903ed6f836dc496b819ca5e246ed8ac10138c (patch) | |
| tree | 068475a0a85f6ed4919d4443fb39e7027e8485ed /libc/include/malloc.h | |
| parent | 07a2606db934d1ecf6debe2332f713bb1feab615 (diff) | |
| parent | 9e02e20878aaae4ea639246213af61378ccc728c (diff) | |
Merge "Revert "Retire GCC FORTIFY."" am: 758051f058
am: 9e02e20878
Change-Id: I79064de26a6642b2ff5a788c8ccb50bf91c35ab7
Diffstat (limited to 'libc/include/malloc.h')
| -rw-r--r-- | libc/include/malloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/include/malloc.h b/libc/include/malloc.h index f7adfbb16..3a678a94e 100644 --- a/libc/include/malloc.h +++ b/libc/include/malloc.h @@ -23,8 +23,8 @@ __BEGIN_DECLS -// Remove this workaround once b/37423073 is fixed. -#if !__has_attribute(alloc_size) +// Remove the workaround once b/37423073 is fixed. +#if defined(__clang__) && !__has_attribute(alloc_size) #define __BIONIC_ALLOC_SIZE(...) #else #define __BIONIC_ALLOC_SIZE(...) __attribute__((__alloc_size__(__VA_ARGS__))) |