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

IC 20200304 #369

Merged
merged 1 commit into from
Mar 12, 2020
Merged

IC 20200304 #369

merged 1 commit into from
Mar 12, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Mar 10, 2020

Describe the contribution
Integration Candidate 20200304

Fixes #357

See PR #356 for details

Testing performed
CI, Ubuntu-Bionic

Expected behavior changes
None

Additional context
See PR #356

Contributor Info - All information REQUIRED for consideration of pull request
Andrei-Costin Zisu - Planetary Transportation Systems GmbH (Berlin, Germany).
Gerardo E. Cruz-Ortiz - NASA/GSFC

@astrogeco astrogeco changed the title Fix OS_ModuleLoad_Impl when loader is disabled IC 20200304 Mar 10, 2020
When OS_INCLUDE_MODULE_LOADER is disabled, the function header does not
match the definition.
@astrogeco astrogeco merged commit 65a10d2 into master Mar 12, 2020
@astrogeco astrogeco deleted the ic-20200304 branch March 13, 2020 14:05
@skliper skliper added this to the 5.1.0 milestone Jun 1, 2020
jphickey added a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Merge branches 'p27', 'p367' and 'p369' for integration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OS_ModuleLoad_Impl function header does not match definition
3 participants