diff options
| author | Greg Hackmann <ghackmann@google.com> | 2017-10-16 15:28:15 -0700 |
|---|---|---|
| committer | Greg Hackmann <ghackmann@google.com> | 2017-10-16 15:28:21 -0700 |
| commit | 02049f8843cbca96b6bf0821c648071666af89a7 (patch) | |
| tree | fa975cff0515664473f4ac427f69c2657fb7e1ed /arch/x86/boot/string.c | |
| parent | ec888d46d8993b2bf205ed375e538a3819c23659 (diff) | |
| parent | 20ea95166e628343b388139f1b521c50f5fd0b44 (diff) | |
Merge branch 'android-4.4-llvm' into android-4.4
Change-Id: Ieb23e9018ae152706f1980fcd5cbd1dffb4d8be6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'arch/x86/boot/string.c')
| -rw-r--r-- | arch/x86/boot/string.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index 06ceddb3a22e..1d56adea8a7c 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -16,6 +16,15 @@ #include "ctype.h" #include "string.h" +/* + * Undef these macros so that the functions that we provide + * here will have the correct names regardless of how string.h + * may have chosen to #define them. + */ +#undef memcpy +#undef memset +#undef memcmp + int memcmp(const void *s1, const void *s2, size_t len) { u8 diff; |