util.h: #include zephyr/toolchain.h, not zephyr/toolchain/common.h #62620
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commit 9c5dafe ("util: add type checking to CONTAINER_OF") made `util.h` #include `toolchain/common.h` in order to get `BUILD_ASSERT()` used by CONTAINER_OF_VALIDATE() when compiling C code. However `toolchain/common.h` is not supposed to be included directly but indirectly through `toolchain/<your_toolchain>.h` and in a very specific order. The direct inclusion caused the following warning when compiling C++: ``` toolchain/gcc.h:87: error: "ZRESTRICT" redefined [-Werror] 87 | #define ZRESTRICT __restrict | In file included from include/zephyr/sys/util.h:18: note: this is the location of the previous definition: include/zephyr/toolchain/common.h:33: 33 | #define ZRESTRICT ``` Fix this issue zephyrproject-rtos#62464 by including `zephyr/toolchain.h` instead, as done by 350 other files. Fixes commit 9c5dafe ("util: add type checking to CONTAINER_OF") Signed-off-by: Marc Herbert <[email protected]>
marc-hb
requested review from
nashif,
carlescufi,
galak and
MaureenHelm
as code owners
marc-hb
requested review from
andyross,
fabiobaltieri,
gmarull,
dcpleung and
kv2019i
marc-hb
added
bug
fabiobaltieri
approved these changes
Sep 14, 2023
fabiobaltieri
added
Hotfix
gmarull
approved these changes
Sep 14, 2023
There's quite few of these in the code base, may be worth doing a pass. |
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit 9c5dafe ("util: add type checking to CONTAINER_OF") made
util.h#includetoolchain/common.hin order to getBUILD_ASSERT()used by CONTAINER_OF_VALIDATE() when compiling C code.However
toolchain/common.his not supposed to be included directly but indirectly throughtoolchain/<your_toolchain>.hand in a very specific order.The direct inclusion caused the following warning when compiling C++:
Fix this issue #62464 by including
zephyr/toolchain.hinstead, as done by 350 other files.Fixes commit 9c5dafe ("util: add type checking to CONTAINER_OF")