[#81] Fix socket_macros header for windows

eclipse-iceoryx · Jan 14, 2024 · 8dc38e8 · 8dc38e8
1 parent 92f4fed
commit 8dc38e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git 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 <MSWSock.h>
+// clang-format off
+// the include order is important, since some headers are defining macros that
+// are used in the next header
 #include <WinSock2.h>
 #include <Windows.h>
+#include <MSWSock.h>
 #include <io.h>
+// clang-format on
 #else
 #include <sys/select.h>
 #include <sys/socket.h>

diff --git 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,
         }
     }
 }