diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-08-25 12:20:54 -0700 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-08-25 12:20:54 -0700 |
| commit | 4f9bfdcaca2414c8959986f0a4d73f16cb15e1c4 (patch) | |
| tree | 540bab5498d276cbbfad24c48a7ff989ee8b920a /libc/include/strings.h | |
| parent | bfda022dd6fbbcea60e9f52496d90ece514b32da (diff) | |
| parent | f77cc9b224c35fa7d1d71e7c374ef19e47b5f6a5 (diff) | |
Merge RP1A.190822.001
Change-Id: Iaf90835a99d87f6246798efd2cea6fe9f750ea18
Diffstat (limited to 'libc/include/strings.h')
| -rw-r--r-- | libc/include/strings.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libc/include/strings.h b/libc/include/strings.h index ccdac044c..a054aed55 100644 --- a/libc/include/strings.h +++ b/libc/include/strings.h @@ -51,17 +51,15 @@ __BEGIN_DECLS -#if defined(__BIONIC_FORTIFY) /** Deprecated. Use memmove() instead. */ -#define bcopy(b1, b2, len) (void)(__builtin___memmove_chk((b2), (b1), (len), __bos0(b2))) -/** Deprecated. Use memset() instead. */ -#define bzero(b, len) (void)(__builtin___memset_chk((b), '\0', (len), __bos0(b))) -#else -/** Deprecated. Use memmove() instead. */ -#define bcopy(b1, b2, len) (void)(__builtin_memmove((b2), (b1), (len))) +static __inline__ __always_inline void bcopy(const void* b1, void* b2, size_t len) { + __builtin_memmove(b2, b1, len); +} + /** Deprecated. Use memset() instead. */ -#define bzero(b, len) (void)(__builtin_memset((b), '\0', (len))) -#endif +static __inline__ __always_inline void bzero(void* b, size_t len) { + __builtin_memset(b, 0, len); +} #if !defined(__i386__) || __ANDROID_API__ >= __ANDROID_API_J_MR2__ /** @@ -72,6 +70,10 @@ __BEGIN_DECLS int ffs(int __i) __INTRODUCED_IN_X86(18); #endif +#if defined(__BIONIC_INCLUDE_FORTIFY_HEADERS) +#include <bits/fortify/strings.h> +#endif + __END_DECLS #include <android/legacy_strings_inlines.h> |