X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e..7ee9d059c4eecf68ae4f8b0fb99ae2471eda79af:/bsd/i386/ucontext.h?ds=sidebyside

diff --git a/bsd/i386/ucontext.h b/bsd/i386/ucontext.h
index b26c486e6..acae1f055 100644
--- a/bsd/i386/ucontext.h
+++ b/bsd/i386/ucontext.h
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.  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, 
- * 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 
+ * 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. 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,
+ * 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.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #ifndef _I386_UCONTEXT_H_
@@ -35,50 +33,31 @@
 #include <sys/appleapiopts.h>
 #include <mach/thread_status.h>
 
-#ifndef _POSIX_C_SOURCE
+#if !__DARWIN_UNIX03
 struct mcontext
-#else /* _POSIX_C_SOURCE */
+#else /* __DARWIN_UNIX03 */
 struct __darwin_mcontext
-#endif /* _POSIX_C_SOURCE */
+#endif /* __DARWIN_UNIX03 */
 {
-#if __LP64__
-	x86_exception_state64_t	es;
-	x86_thread_state64_t 	ss;	
-	x86_float_state64_t	fs;
-#else
-	x86_exception_state32_t	es;
-	x86_thread_state32_t 	ss;	
-	x86_float_state32_t	fs;
-#endif
+	i386_exception_state_t	es;
+	i386_thread_state_t 	ss;	
+	i386_float_state_t	fs;
 };
 
-#ifndef _POSIX_C_SOURCE
-#if __LP64__
-#define I386_MCONTEXT_SIZE	(x86_THREAD_STATE64_COUNT + x86_FLOAT_STATE64_COUNT + x86_EXCEPTION_STATE64_COUNT) * sizeof(int)
-#else
-#define I386_MCONTEXT_SIZE	(x86_THREAD_STATE32_COUNT + x86_FLOAT_STATE32_COUNT + x86_EXCEPTION_STATE32_COUNT) * sizeof(int)
-#endif
-#endif /* _POSIX_C_SOURCE */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define I386_MCONTEXT_SIZE	(i386_THREAD_STATE_COUNT + i386_FLOAT_STATE_COUNT + I386_EXCEPTION_STATE_COUNT) * sizeof(int)
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 
 #ifndef _MCONTEXT_T
 #define _MCONTEXT_T
-typedef __darwin_mcontext_t	mcontext_t;
+#if defined(__LP64__)
+typedef __darwin_mcontext64_t	mcontext_t;
+#else
+typedef __darwin_mcontext32_t	mcontext_t;
 #endif
-
-
-#ifdef XNU_KERNEL_PRIVATE
-struct mcontext64 {
-	x86_exception_state64_t	es;
-	x86_thread_state64_t 	ss;	
-	x86_float_state64_t	fs;
-};
-
-struct mcontext32 {
-	x86_exception_state32_t	es;
-	x86_thread_state32_t 	ss;	
-	x86_float_state32_t	fs;
-};
 #endif
 
+//#endif
+
 
 #endif /* _I386_UCONTEXT_H_ */