Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Fixes for upmerge 01.03.2024 #158

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Conversation

rlubos
Copy link
Contributor

@rlubos rlubos commented Mar 4, 2024

For now fixing twister only, it needs to be verified with downstream tests whether the change actually makes sense.
Good to go from my PoV.

@rlubos rlubos changed the title [TESTING ONLY, no need to review] Fixes for upmerge 01 03 2024 Fixes for upmerge 01.03.2024 Mar 4, 2024
@rlubos rlubos force-pushed the upmerge-01-03-2024 branch from ae704ae to 9d44467 Compare March 6, 2024 12:41
@rlubos rlubos marked this pull request as ready for review March 11, 2024 13:11
@rlubos rlubos force-pushed the upmerge-01-03-2024 branch from 9d44467 to 0dd5310 Compare March 20, 2024 10:56
#else /* defined(CONFIG_POSIX_API) */
#include <zephyr/net/net_ip.h>
#include <zephyr/net/socket.h>
#endif /* defined(CONFIG_POSIX_API) */
#include <zephyr/shell/shell.h>
#endif /* defined(CONFIG_ZEPHYR) */

#define signal(a, b) (void)(b)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be for Zephyr only? or at least #ifndef signal

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add ifndef

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or, actually, signal could be a function so ifndef won't work, better to pull it under Zephyr only.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Supplicant will now use POSIX signal implementation from Zephyr, the
same wasy as it's done for the upstream (Zephyr) supplicant, as
using libc signal conflicts on sigset_t type definition.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos rlubos force-pushed the upmerge-01-03-2024 branch from 0dd5310 to a90d6b5 Compare March 21, 2024 10:42
@rlubos rlubos merged commit b69c894 into nrfconnect:main Mar 21, 2024
1 check passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants