patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

arch: posix: Declare _posix_zephyr_main with int return type

Browse source 
This commit updates the `_posix_zephyr_main` declaration to use the
return type of `int` instead of `void` when `CONFIG_CPP_MAIN=y` (i.e.
C++-compliant main() support is enabled) so that Zephyr applications
defining their main() in a C++ source file can make use of the proper
main() definition of `int main(void)` as required by the C++ standard.

Note that the forward declaration of `_posix_zephyr_main` is required
if and only if the main() is defined in a C++ source file (i.e. when
`CONFIG_CPP_MAIN=y`).

Signed-off-by: Stephanos Ioannidis <stephanos.ioannidis@nordicsemi.no>
This commit is contained in:
Stephanos Ioannidis 2022-11-05 00:22:38 +09:00 committed by Stephanos Ioannidis
parent fa5fd41b61
commit ae0437d2df
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/posix/include/posix_cheats.h
View file

@ -44,18 +44,13 @@
#define main(...) _posix_zephyr_main(__VA_ARGS__)
#endif
#ifdef __cplusplus
extern "C" {
#endif
#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
* this will be the prototype after renaming:
*/
void _posix_zephyr_main(void);
#ifdef __cplusplus
}
extern "C" int _posix_zephyr_main(void);
#endif
#ifdef CONFIG_POSIX_API