diff options
author | Ambroise Vincent <ambroise.vincent@arm.com> | 2019-02-11 14:13:43 +0000 |
---|---|---|
committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2019-03-04 12:20:38 +0000 |
commit | 602b7f58dd7668411c8a4032652b4552bd7fe934 (patch) | |
tree | 675e0939d19e306e01703359d7b8661d4f312d32 /lib | |
parent | 8a573de8dda42258b747e56f19190311ea090d29 (diff) | |
download | tf-a-tests-602b7f58dd7668411c8a4032652b4552bd7fe934.tar.gz |
libc: Update includes
Reflect the changes in the structure of libc.
NB: the include of stdarg.h in nvm_results_helpers.c is not in alphabetical
order because it needs to be included before stdio.h. Fixing this would require
further changes.
Change-Id: I07f62a3450802833408ff3e1f950fd3b643e5e33
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/compiler-rt/builtins/int_lib.h | 5 | ||||
-rw-r--r-- | lib/power_management/suspend/suspend_private.h | 1 | ||||
-rw-r--r-- | lib/utils/uuid.c | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/compiler-rt/builtins/int_lib.h b/lib/compiler-rt/builtins/int_lib.h index 724d5a4fe..2acc4bff2 100644 --- a/lib/compiler-rt/builtins/int_lib.h +++ b/lib/compiler-rt/builtins/int_lib.h @@ -60,9 +60,8 @@ #define UNUSED __attribute__((unused)) #endif -#include <sys/limits.h> -#include <sys/stdint.h> -#include <sys/types.h> +#include <limits.h> +#include <stdint.h> /* Include the commonly used internal type definitions. */ #include "int_types.h" diff --git a/lib/power_management/suspend/suspend_private.h b/lib/power_management/suspend/suspend_private.h index dfc2e930e..9949dc6d3 100644 --- a/lib/power_management/suspend/suspend_private.h +++ b/lib/power_management/suspend/suspend_private.h @@ -16,7 +16,6 @@ #include <power_management.h> #include <stdint.h> #include <string.h> -#include <types.h> #define NR_CTX_REGS 6 diff --git a/lib/utils/uuid.c b/lib/utils/uuid.c index 21747a208..2c79dfbdc 100644 --- a/lib/utils/uuid.c +++ b/lib/utils/uuid.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Arm Limited. All rights reserved. + * Copyright (c) 2018-2019, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -10,8 +10,8 @@ #include <uuid_utils.h> /* Format string to print a UUID */ -static const char *uuid_str_fmt = "{ 0x%.8x, 0x%.4x, 0x%.4x, 0x%.2x, 0x%.2x, " - "0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }"; +static const char *uuid_str_fmt = "{ 0x%08x, 0x%04x, 0x%04x, 0x%02x, 0x%02x, " + "0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x }"; unsigned int is_uuid_null(const uuid_t *uuid) |