diff options
| author | Simon Glass <sjg@chromium.org> | 2020-11-04 17:13:56 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-09 19:48:50 +0000 |
| commit | e6d6403b047bea8016af1f669ff3b66531bc72eb (patch) | |
| tree | a27cad3948a81d5ba1864aa5926063d9e6045807 /zephyr/shim/include/builtin | |
| parent | 3afeb0c2f9c92146c20b540e8d4e4c9ef1afc9d1 (diff) | |
| download | chrome-ec-e6d6403b047bea8016af1f669ff3b66531bc72eb.tar.gz | |
zephyr: Redefine assert safely
At present a build error is produced when building keyboard_scan.c
due to a redefinition of this symbol. Undef it first.
BUG=b:167405015
BRANCH=none
TEST=make BOARD=volteer
zmake configure .../zephyr-chrome/projects/experimental/volteer \
-B /tmp/z/cos
zmake build /tmp/z/cos
see there are no errors
Change-Id: I9b13d1737d6ce6f7ab35b0d6457c2db49cea8dbc
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2523838
Reviewed-by: Yuval Peress <peress@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Commit-Queue: Jett Rink <jettrink@chromium.org>
Tested-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'zephyr/shim/include/builtin')
| -rw-r--r-- | zephyr/shim/include/builtin/assert.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/zephyr/shim/include/builtin/assert.h b/zephyr/shim/include/builtin/assert.h index 183e52ae79..21a6c5b3d7 100644 --- a/zephyr/shim/include/builtin/assert.h +++ b/zephyr/shim/include/builtin/assert.h @@ -9,6 +9,7 @@ #include <sys/__assert.h> #undef ASSERT +#undef assert #define ASSERT __ASSERT_NO_MSG #define assert __ASSERT_NO_MSG |