summaryrefslogtreecommitdiff
path: root/libc/include/malloc.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-07-24 11:41:41 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-07-24 11:41:41 -0700
commit29dd94ad9888c3e1ad0c213c3af01541c9da1229 (patch)
tree48a51876da8e0a43c2c46393d03a599f016dceae /libc/include/malloc.h
parentae90a20db306fdf7839c1e38c9e2af8d69d6ba9c (diff)
parent85e279e4f98f2a71680ecbd27f328686231230fc (diff)
Merge "Retire GCC FORTIFY." am: 85e84f1117 am: e90a2850e9 am: 07a2606db9
am: 85e279e4f9 Change-Id: I5b70c81f3a3a7bf44921fd123778dfde58b134fc
Diffstat (limited to 'libc/include/malloc.h')
-rw-r--r--libc/include/malloc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/include/malloc.h b/libc/include/malloc.h
index 3a678a94e..f7adfbb16 100644
--- a/libc/include/malloc.h
+++ b/libc/include/malloc.h
@@ -23,8 +23,8 @@
__BEGIN_DECLS
-// Remove the workaround once b/37423073 is fixed.
-#if defined(__clang__) && !__has_attribute(alloc_size)
+// Remove this workaround once b/37423073 is fixed.
+#if !__has_attribute(alloc_size)
#define __BIONIC_ALLOC_SIZE(...)
#else
#define __BIONIC_ALLOC_SIZE(...) __attribute__((__alloc_size__(__VA_ARGS__)))