Merge "When compiling with clang, don't "fortify_source" the strlcpy and strlcat."
diff --git a/libc/arch-x86/include/machine/_types.h b/libc/arch-x86/include/machine/_types.h
index 65892a1..d3d9eeb 100644
--- a/libc/arch-x86/include/machine/_types.h
+++ b/libc/arch-x86/include/machine/_types.h
@@ -58,8 +58,6 @@
# endif
#endif
-#include <linux/types.h>
-
/* 7.18.1.1 Exact-width integer types */
typedef __signed char __int8_t;
typedef unsigned char __uint8_t;
diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h
index f088e33..987a5e3 100644
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
@@ -502,18 +502,11 @@
#include <android/api-level.h>
#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 \
extern inline \
__attribute__ ((always_inline)) \
__attribute__ ((gnu_inline)) \
__attribute__ ((artificial))
-#endif
#define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1)
#endif