xnu-6153.41.3.tar.gz

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

diff --git a/bsd/sys/ucontext.h b/bsd/sys/ucontext.h
index d0ac4ba08380af29e69de57b8ae9834f95524a64..06f867686db2fa4373f0b7eb4a18f446d85588e4 100644 (file)
--- a/bsd/sys/ucontext.h
+++ b/bsd/sys/ucontext.h
@@ -1,15 +1,20 @@
 /*
- * 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_LICENSE_HEADER_START@
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -17,8 +22,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #ifndef _SYS_UCONTEXT_H_
@@ -26,56 +31,35 @@
 
 #include <sys/cdefs.h>
 #include <sys/_types.h>
-#include <machine/ucontext.h>
 
-#ifndef _SIGSET_T
-#define _SIGSET_T
-typedef __darwin_sigset_t      sigset_t;
-#endif
+#include <machine/_mcontext.h>
+#include <sys/_types/_sigaltstack.h>
+#include <sys/_types/_ucontext.h>
 
-#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 */
+#include <sys/_types/_sigset_t.h>
 
 #ifdef KERNEL
-#include <machine/types.h>     /* user_addr_t, user_size_t */
-
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
+#include <machine/types.h>      /* user_addr_t, user_size_t */
 
 /* kernel representation of struct ucontext64 for 64 bit processes */
-struct user_ucontext64 {
-       int                             uc_onstack;
-       sigset_t                        uc_sigmask;     /* signal mask */
-       struct user_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 */
-};
+typedef struct user_ucontext64 {
+       int                             uc_onstack;
+       sigset_t                        uc_sigmask;     /* signal mask */
+       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;
 
-#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  /* KERNEL */
 
 #endif /* _SYS_UCONTEXT_H_ */