diff --git a/iceoryx2-pal/posix/src/c/socket_macros.c b/iceoryx2-pal/posix/src/c/socket_macros.c index 025f44171..e32b4b4fb 100644 --- a/iceoryx2-pal/posix/src/c/socket_macros.c +++ b/iceoryx2-pal/posix/src/c/socket_macros.c @@ -11,10 +11,14 @@ // SPDX-License-Identifier: Apache-2.0 OR MIT #ifdef _WIN64 -#include +// clang-format off +// the include order is important, since some headers are defining macros that +// are used in the next header #include #include +#include #include +// clang-format on #else #include #include diff --git a/iceoryx2-pal/posix/src/windows/types.rs b/iceoryx2-pal/posix/src/windows/types.rs index 8f3dc5d2f..8bf3c67d1 100644 --- a/iceoryx2-pal/posix/src/windows/types.rs +++ b/iceoryx2-pal/posix/src/windows/types.rs @@ -224,17 +224,17 @@ impl Struct for sched_param {} #[derive(Clone, Copy)] #[repr(C)] pub struct sigaction_t { - pub sa_handler: sighandler_t, - pub sa_mask: sigset_t, - pub sa_flags: int, + pub iox2_sa_handler: sighandler_t, + pub iox2_sa_mask: sigset_t, + pub iox2_sa_flags: int, } impl Struct for sigaction_t { fn new() -> Self { Self { - sa_handler: 0, - sa_mask: sigset_t::new(), - sa_flags: 0, + iox2_sa_handler: 0, + iox2_sa_mask: sigset_t::new(), + iox2_sa_flags: 0, } } }