xnu-1699.22.81.tar.gz

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

diff --git a/bsd/sys/ucontext.h b/bsd/sys/ucontext.h
index 18f0c4a02cfad0ce5f59f3a29c3eb14176f5caab..249cf5e235c06525190ad00fb0d196c7565b2307 100644 (file)
--- a/bsd/sys/ucontext.h
+++ b/bsd/sys/ucontext.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2002-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2002-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -31,56 +31,39 @@
 
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 
 #include <sys/cdefs.h>
 #include <sys/_types.h>

-#include <machine/ucontext.h>
+
+#define __need_mcontext_t
+#define __need_stack_t
+#define __need_ucontext_t
+#include <sys/_structs.h>

 
 #ifndef _SIGSET_T
 #define _SIGSET_T
 typedef __darwin_sigset_t      sigset_t;
 #endif
 
 
 #ifndef _SIGSET_T
 #define _SIGSET_T
 typedef __darwin_sigset_t      sigset_t;
 #endif
 

-#ifndef _STACK_T
-#define _STACK_T
-typedef __darwin_stack_t       stack_t;
-#endif
-
-#ifndef _UCONTEXT_T
-#define _UCONTEXT_T
-#ifndef _POSIX_C_SOURCE
-typedef struct ucontext        ucontext_t;
-#else /* _POSIX_C_SOURCE */
-typedef struct __darwin_ucontext ucontext_t;
-#endif /* _POSIX_C_SOURCE */
-#endif
-
-#ifndef _POSIX_C_SOURCE
-#ifndef _UCONTEXT64_T
-#define _UCONTEXT64_T
-typedef struct ucontext64      ucontext64_t;
-#endif
-#endif /* _POSIX_C_SOURCE */
-

 #ifdef KERNEL
 #include <machine/types.h>     /* user_addr_t, user_size_t */
 
 #ifdef KERNEL
 #include <machine/types.h>     /* user_addr_t, user_size_t */
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-

 /* kernel representation of struct ucontext64 for 64 bit processes */
 /* 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 */
        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_addr_t                     uc_link;        /* ucontext pointer */
        user_size_t                     uc_mcsize;      /* mcontext size */
        user_addr_t                     uc_mcontext64;  /* machine context */

-};
+} user_ucontext64_t;

 
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
+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_ */
 #endif /* KERNEL */
 
 #endif /* _SYS_UCONTEXT_H_ */