diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-12-06 11:15:58 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-12-06 11:15:58 +0000 |
| commit | ade3f5df966e7cfd0c5a3c173dba982d3b2ee712 (patch) | |
| tree | 343968b254a38d38eb72ca8fdcea3c1de2ee28b1 /include/lib/libc/string.h | |
| parent | f224bd4ee28e1a5f13a4f029ed5038879e387ed4 (diff) | |
| parent | d45c323a9c34404cbec5711acc9ba2dced8e1ba7 (diff) | |
| download | platform_external_arm-trusted-firmware-ade3f5df966e7cfd0c5a3c173dba982d3b2ee712.tar.gz platform_external_arm-trusted-firmware-ade3f5df966e7cfd0c5a3c173dba982d3b2ee712.tar.bz2 platform_external_arm-trusted-firmware-ade3f5df966e7cfd0c5a3c173dba982d3b2ee712.zip | |
Merge changes from topic "bs/libc" into integration
* changes:
libc: Consolidate the size_t and NULL definitions
libc: Consolidate unified definitions
libc: Unify intmax_t and uintmax_t on AArch32/64
Diffstat (limited to 'include/lib/libc/string.h')
| -rw-r--r-- | include/lib/libc/string.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/lib/libc/string.h b/include/lib/libc/string.h index ee6eeacef..c92b6808c 100644 --- a/include/lib/libc/string.h +++ b/include/lib/libc/string.h @@ -4,18 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ /* - * Portions copyright (c) 2018, ARM Limited and Contributors. + * Portions copyright (c) 2018-2019, ARM Limited and Contributors. * All rights reserved. */ #ifndef STRING_H #define STRING_H -#include <string_.h> - -#ifndef NULL -#define NULL ((void *) 0) -#endif +#include <stddef.h> void *memcpy(void *dst, const void *src, size_t len); void *memmove(void *dst, const void *src, size_t len); |