include/sof/common.h: Fix collisions with Zephyr symbols #3545
Conversation
This file contains hidden or 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
IS_ENABLED and ARRAY_SIZE exist in effectively identical forms in the Zephyr headers already. Disable the SOF definitions when building with Zephyr to avoid the macro redefinition collision. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
andyross
requested review from
dbaluta,
jajanusz,
lbetlej,
mmaka1 and
plbossart
as code owners
andyross
pushed a commit
to andyross/zephyr
that referenced
this pull request
Oct 22, 2020
Currently SOF and Zephyr define the same common macros. Avoid redifinition error until SOF port is complete. This patch can be removed when this pull request is merged in upstream SOF: thesofproject/sof#3545 Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Member
|
SOFCI TEST |
lgirdwood
approved these changes
Oct 29, 2020
Member
lgirdwood
left a comment
lgirdwood
left a comment
There was a problem hiding this comment.
Looks like CI issue is unrelated and a script failure.
Member
|
@andyross could you send the same patch into master too. Thanks. This will help us with CI as it may be trying a test that's not in stable. |
lyakh
reviewed
Oct 29, 2020
Collaborator
lyakh
left a comment
lyakh
left a comment
There was a problem hiding this comment.
tested to work, but shouldn't we rather do #ifndef ARRAY_SIZE and #ifndef IS_ENABLED respectively?
Member
|
@lyakh can you do a PR for this into master, then we can merge into stable. Thanks |
Member
|
@lyakh ping. |
Contributor
Author
|
Close, rolled into #3601 and sent to master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
[As before, I'm not sure if stable-v1.6 is the correct branch to which to submit]
IS_ENABLED and ARRAY_SIZE exist in effectively identical forms in the
Zephyr headers already. Disable the SOF definitions when building
with Zephyr to avoid the macro redefinition collision.
Signed-off-by: Andy Ross andrew.j.ross@intel.com