Merge remote-tracking branch 'upstream/multiprocess_el1' into multipr…

…ocess-loopback
lhw2002426 · Dec 15, 2024 · 19fa8e6 · 19fa8e6
2 parents 6f4bf66 + 27bcc5d
commit 19fa8e6
Show file tree

Hide file tree

Showing 14 changed files with 984 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/ruxos_posix_api/build.rs b/api/ruxos_posix_api/build.rs
@@ -111,7 +111,9 @@ typedef struct {{
         let allow_vars = [
             "O_.*",
             "AF_.*",
+            "SO_.*",
             "SOCK_.*",
+            "SOL_.*",
             "IPPROTO_.*",
             "FD_.*",
             "F_.*",

diff --git a/api/ruxos_posix_api/ctypes.h b/api/ruxos_posix_api/ctypes.h
@@ -29,6 +29,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/uio.h>
+#include <sys/un.h>
 #include <unistd.h>
 #include <dirent.h>