[Minios-devel] [UNIKRAFT PATCH 3/4] lib/ukcontext: Adapt ucontext.h

[Charalampos Mainas <Charalampos.Mainas@xxxxxxxxx>]

Signed-off by: Charalampos Mainas <charalampos.mainas@xxxxxxxxx>
---
 lib/ukucontext/include/ucontext.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/ukucontext/include/ucontext.h 
b/lib/ukucontext/include/ucontext.h
index eb83ce24..07837882 100644
--- a/lib/ukucontext/include/ucontext.h
+++ b/lib/ukucontext/include/ucontext.h
@@ -59,6 +59,9 @@ typedef struct {
 } mcontext_t;
 #endif
 
+// Conflict with sigset_t from newlib. Using same definition as in musl
+typedef struct { unsigned long __bits[128/sizeof(long)]; } uco_sigset_t;
+
 struct sigaltstack {
        void *ss_sp;
        int ss_flags;
@@ -68,9 +71,9 @@ struct sigaltstack {
 typedef struct __ucontext {
        unsigned long uc_flags;
        struct __ucontext *uc_link;
-       stack_t uc_stack;
+       struct sigaltstack uc_stack;
        mcontext_t uc_mcontext;
-       sigset_t uc_sigmask;
+       uco_sigset_t uc_sigmask;
        unsigned long __fpregs_mem[64];
 } ucontext_t;
 
-- 
2.17.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel