Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integration Candidate 2020-10-13 #206

Merged
merged 5 commits into from
Oct 13, 2020
Merged

Integration Candidate 2020-10-13 #206

merged 5 commits into from
Oct 13, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Oct 12, 2020

Describe the contribution
Fix #200
Fix #204

Testing performed
See Bundle PR - https://github.com/nasa/cFS/pull/147/checks

Expected behavior changes

PR #201 - Use the osal_id_t typedef whenever dealing with an OSAL ID value.

PR #205 - Resolves build error regarding redefinition of PPC macros in the coverage test, when building on the actual ppc/vxworks target.

System(s) tested on
Bundle CI, Ubuntu

Additional context
Part of nasa/cFS#147

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey

jphickey and others added 3 commits October 2, 2020 16:08
Use the osal_id_t typedef whenever dealing with an OSAL ID value.
Resolves build error regarding redefinition of PPC macros in the
coverage test, when building on the actual ppc/vxworks target.

This is due to the fact that the system limits.h file implicitly
provides these PPC symbols.  It does not appear that there are
any current test cases that depend on values of these symbols.
Fix #204, redefinition of macros in PPC vxworks unit test build
@astrogeco astrogeco closed this Oct 13, 2020
@astrogeco astrogeco reopened this Oct 13, 2020
@astrogeco astrogeco marked this pull request as ready for review October 13, 2020 15:05
@astrogeco astrogeco merged commit e7af6d3 into main Oct 13, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Oct 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants