xnu-792.10.96.tar.gz

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

diff --git a/bsd/sys/ucontext.h b/bsd/sys/ucontext.h
index d0ac4ba08380af29e69de57b8ae9834f95524a64..edb6499db8f1007bb62b223be637f8f605b9e290 100644 (file)
--- a/bsd/sys/ucontext.h
+++ b/bsd/sys/ucontext.h
@@ -3,20 +3,19 @@
  *
  * @APPLE_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.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource 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
+ * This 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -57,10 +56,6 @@ typedef struct ucontext64    ucontext64_t;
 #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 */
 struct user_ucontext64 {
        int                             uc_onstack;
 /* kernel representation of struct ucontext64 for 64 bit processes */
 struct user_ucontext64 {
        int                             uc_onstack;


@@ -71,10 +66,6 @@ struct user_ucontext64 {
        user_addr_t                     uc_mcontext64;  /* machine context */
 };
 
        user_addr_t                     uc_mcontext64;  /* machine context */
 };
 

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

 typedef struct user_ucontext64 user_ucontext64_t;
 #endif /* KERNEL */
 
 typedef struct user_ucontext64 user_ucontext64_t;
 #endif /* KERNEL */