xnu-1228.12.14.tar.gz

[apple/xnu.git] / osfmk / mach / error.h

diff --git a/osfmk/mach/error.h b/osfmk/mach/error.h
index 2f6d6c4cbebfa01e97eb563b5e020c4e4d12c173..a32eaee53e2a1a4250a14993100660c5c88d2490 100644 (file)
--- a/osfmk/mach/error.h
+++ b/osfmk/mach/error.h
@@ -1,112 +1,33 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * 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.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

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

  */
 /*
  * @OSF_COPYRIGHT@
  */
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/*
- * HISTORY
- * 
- * Revision 1.1.1.1  1998/09/22 21:05:29  wsanchez
- * Import of Mac OS X kernel (~semeria)
- *
- * Revision 1.1.1.1  1998/03/07 02:25:45  wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.2.10.2  1995/02/23  17:51:15  alanl
- *     Merge with DIPC2_SHARED.
- *     [1995/01/03  21:49:04  alanl]
- *
- * Revision 1.2.10.1  1994/09/23  02:35:28  ezf
- *     change marker to not FREE
- *     [1994/09/22  21:39:26  ezf]
- * 
- * Revision 1.2.8.1  1994/08/04  02:27:36  mmp
- *     NOTE: file was moved back to b11 version for dipc2_shared.
- *     Added DIPC error system.
- *     [1994/05/11  17:36:37  alanl]
- * 
- * Revision 1.2.2.3  1993/08/12  21:59:50  jvs
- *     Correctly prototype mach_error_fn_t typedef.  9523
- *     [1993/08/12  21:57:56  jvs]
- * 
- * Revision 1.2.2.2  1993/06/09  02:39:58  gm
- *     Added to OSF/1 R1.3 from NMK15.0.
- *     [1993/06/02  21:15:47  jeffc]
- * 
- * Revision 1.2  1993/04/19  16:33:02  devrcs
- *     make endif tags ansi compliant/include files
- *     [1993/02/20  21:44:37  david]
- * 
- * Revision 1.1  1992/09/30  02:30:35  robert
- *     Initial revision
- * 
- * $EndLog$
- */
-/* CMU_HIST */
-/*
- * Revision 2.4  91/05/14  16:51:24  mrt
- *     Correcting copyright
- * 
- * Revision 2.3  91/02/05  17:31:48  mrt
- *     Changed to new Mach copyright
- *     [91/02/01  17:16:50  mrt]
- * 
- * Revision 2.2  90/06/02  14:57:47  rpd
- *     Added err_mach_ipc for new IPC.
- *     [90/03/26  22:28:42  rpd]
- * 
- * Revision 2.1  89/08/03  16:02:07  rwd
- * Created.
- * 
- * Revision 2.4  89/02/25  18:13:18  gm0w
- *     Changes for cleanup.
- * 
- * Revision 2.3  89/02/07  00:51:57  mwyoung
- * Relocated from sys/error.h
- * 
- * Revision 2.2  88/10/18  00:37:31  mwyoung
- *     Added {system,sub and code}_emask 
- *     [88/10/17  17:06:58  mrt]
- * 
- *     Added {system,sub and code}_emask 
- *
- *  12-May-88 Mary Thompson (mrt) at Carnegie Mellon
- *     Changed mach_error_t from unsigned int to kern_return_t
- *     which is a 32 bit integer regardless of machine type.
- *      insigned int was incompatible with old usages of mach_error.
- *
- *  10-May-88 Douglas Orr (dorr) at Carnegie-Mellon University
- *     Missing endif replaced
- *
- *   5-May-88 Mary Thompson (mrt) at Carnegie Mellon
- *     Changed typedef of mach_error_t from long to unsigned int
- *     to keep our Camelot users happy. Also moved the nonkernel
- *     function declarations from here to mach_error.h.
- *
- *  10-Feb-88 Douglas Orr (dorr) at Carnegie-Mellon University
- *     Created.
- *
- */
-/* CMU_ENDHIST */

 /* 
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
 /* 
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University


@@ -141,8 +62,9 @@
  *
  */
 
  *
  */
 

-#ifndef        ERROR_H_
-#define ERROR_H_
+#ifndef        _MACH_ERROR_H_
+#define        _MACH_ERROR_H_
+

 #include <mach/kern_return.h>
 
 /*
 #include <mach/kern_return.h>
 
 /*


@@ -189,4 +111,4 @@
 typedef        kern_return_t   mach_error_t;
 typedef mach_error_t   (* mach_error_fn_t)( void );
 
 typedef        kern_return_t   mach_error_t;
 typedef mach_error_t   (* mach_error_fn_t)( void );
 

-#endif /* ERROR_H_ */
+#endif /* _MACH_ERROR_H_ */