xnu-792.6.61.tar.gz

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

diff --git a/bsd/sys/ucontext.h b/bsd/sys/ucontext.h
index dd97a8cef0375c19bc12ece20c662913ee1a7fa6..f231226a23cf8faeb24d2386ba7df3df3c5e340d 100644 (file)
--- a/bsd/sys/ucontext.h
+++ b/bsd/sys/ucontext.h
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -23,29 +23,58 @@
 #ifndef _SYS_UCONTEXT_H_
 #define _SYS_UCONTEXT_H_
 
 #ifndef _SYS_UCONTEXT_H_
 #define _SYS_UCONTEXT_H_
 

+#include <sys/cdefs.h>
+#include <sys/_types.h>

 #include <machine/ucontext.h>
 
 #include <machine/ucontext.h>
 

-struct ucontext {
-       int             uc_onstack;
-       sigset_t        uc_sigmask;     /* signal mask used by this context */
-       stack_t         uc_stack;       /* stack used by this context */
-       struct ucontext *uc_link;       /* pointer to resuming context */
-       size_t          uc_mcsize;      /* size of the machine context passed in */
-       mcontext_t      uc_mcontext;    /* machine specific context */
-};
+#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 */

 
 

-typedef struct ucontext ucontext_t;
+#ifdef KERNEL
+#include <machine/types.h>     /* user_addr_t, user_size_t */

 
 

-struct ucontext64 {
-       int             uc_onstack;
-       sigset_t        uc_sigmask;     /* signal mask used by this context */
-       stack_t         uc_stack;       /* stack used by this context */
-       struct ucontext *uc_link;       /* pointer to resuming context */
-       size_t          uc_mcsize;      /* size of the machine context passed in */
-       mcontext64_t    uc_mcontext64;  /* machine specific context */
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=natural
+#endif
+
+/* 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 ucontext64 ucontext64_t;
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=reset
+#endif
+
+typedef struct user_ucontext64 user_ucontext64_t;
+#endif /* KERNEL */

 
 #endif /* _SYS_UCONTEXT_H_ */
 
 #endif /* _SYS_UCONTEXT_H_ */