diff options
| author | Yuval Peress <peress@google.com> | 2022-03-27 23:33:58 -0600 |
|---|---|---|
| committer | Aaron Massey <aaronmassey@google.com> | 2022-03-28 19:28:30 +0000 |
| commit | 00c50388198651f2c1c504aba989f47ddee787bd (patch) | |
| tree | 31effbdb1298a15055fcdc82d2740bc40fb14407 /common/util.c | |
| parent | 23236c1be4babc119ee4814cfb56cbffc7906112 (diff) | |
| download | chrome-ec-00c50388198651f2c1c504aba989f47ddee787bd.tar.gz | |
util: Remove implementation of strtoull in Zephyr build
Zephyr defines it's own implementation of strtoull in a libc
minimal implementation so this implementation causes a conflict.
BRANCH=none
BUG=none
TEST=zmake build brya
Cq-Depend: chromium:3552896
Signed-off-by: Yuval Peress <peress@google.com>
Change-Id: I6529639238adbf2baa75f699fe64df09c35910fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3554122
Reviewed-by: Al Semjonovs <asemjonovs@google.com>
Commit-Queue: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'common/util.c')
| -rw-r--r-- | common/util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/util.c b/common/util.c index dac5cf5e09..7b33cc097e 100644 --- a/common/util.c +++ b/common/util.c @@ -71,6 +71,7 @@ __stdlib_compat int strtoi(const char *nptr, char **endptr, int base) return neg ? -result : result; } +#ifndef CONFIG_ZEPHYR __stdlib_compat unsigned long long int strtoull(const char *nptr, char **endptr, int base) { @@ -107,6 +108,7 @@ __stdlib_compat unsigned long long int strtoull(const char *nptr, char **endptr, *endptr = (char *)nptr - 1; return result; } +#endif /* !CONFIG_ZEPHYR */ BUILD_ASSERT(sizeof(unsigned long long int) == sizeof(uint64_t)); __stdlib_compat int parse_bool(const char *s, int *dest) |