Skip to content

Mix fixes following main() type change #56837

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.

Sign up for GitHub

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

Merged
aescolar merged 2 commits into from
Apr 14, 2023
Merged

Mix fixes following main() type change #56837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a4c8fa
arch posix: posix_cheats.h main() type changed in comment
aescolar Apr 14, 2023
7ea36fa
samples/bluetooth/broadcast_audio_sink: Fix return to int
aescolar Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/posix/include/posix_cheats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#if defined(__cplusplus) && defined(CONFIG_CPP_MAIN)
/* To be able to define main() in C++ code we need to have its prototype
* defined somewhere visibly. Otherwise name mangling will prevent the linker
* from finding it. Zephyr assumes a void main(void) prototype and therefore
* from finding it. Zephyr assumes an int main(void) prototype and therefore
* this will be the prototype after renaming:
*/
extern "C" int _posix_zephyr_main(void);
Expand Down
6 changes: 3 additions & 3 deletions samples/bluetooth/broadcast_audio_sink/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ int main(void)
if (err != 0) {
printk("Resetting failed: %d - Aborting\n", err);

return;
return 0;
}

if (IS_ENABLED(CONFIG_SCAN_OFFLOAD)) {
Expand All @@ -609,7 +609,7 @@ int main(void)
printk("Unable to start advertising connectable: %d\n",
err);

return;
return 0;
}

printk("Waiting for Broadcast Assistant\n");
Expand All @@ -622,7 +622,7 @@ int main(void)
printk("Unable to stop advertising: %d\n",
err);

return;
return 0;
}
} else {
/* Wait for the PA request to determine if we
Expand Down