xnu-1699.26.8.tar.gz

[apple/xnu.git] / bsd / sys / ucontext.h

diff --git a/bsd/sys/ucontext.h b/bsd/sys/ucontext.h
index 7ddf51a15f4624e92fd12827e475d82fcc775636..249cf5e235c06525190ad00fb0d196c7565b2307 100644 (file)
--- a/bsd/sys/ucontext.h
+++ b/bsd/sys/ucontext.h
@@ -35,12 +35,6 @@
 #define __need_mcontext_t
 #define __need_stack_t
 #define __need_ucontext_t
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#if defined(__ppc__) || defined(__ppc64__)
-#define __need_mcontext64_t
-#define __need_ucontext64_t
-#endif /* __ppc__|| __ppc64__  */ 
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 #include <sys/_structs.h>
 
 #ifndef _SIGSET_T
@@ -52,16 +46,24 @@ typedef __darwin_sigset_t   sigset_t;
 #include <machine/types.h>     /* user_addr_t, user_size_t */
 
 /* kernel representation of struct ucontext64 for 64 bit processes */
-struct user_ucontext64 {
+typedef struct user_ucontext64 {
        int                             uc_onstack;
        sigset_t                        uc_sigmask;     /* signal mask */
-       struct user_sigaltstack         uc_stack;       /* stack */
+       struct user64_sigaltstack       uc_stack;       /* stack */
        user_addr_t                     uc_link;        /* ucontext pointer */
        user_size_t                     uc_mcsize;      /* mcontext size */
        user_addr_t                     uc_mcontext64;  /* machine context */
-};
+} user_ucontext64_t;
+
+typedef struct user_ucontext32 {
+       int                             uc_onstack;
+       sigset_t                        uc_sigmask;     /* signal mask */
+       struct user32_sigaltstack       uc_stack;       /* stack */
+       user32_addr_t                   uc_link;        /* ucontext pointer */
+       user32_size_t                   uc_mcsize;      /* mcontext size */
+       user32_addr_t                   uc_mcontext;    /* machine context */
+} user_ucontext32_t;
 
-typedef struct user_ucontext64 user_ucontext64_t;
 #endif /* KERNEL */
 
 #endif /* _SYS_UCONTEXT_H_ */