xnu-344.49.tar.gz

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

diff --git a/bsd/sys/exec.h b/bsd/sys/exec.h
index 3abf356dd167d606e2813080e949841e0a99d541..a0dd04095ab56e6b29e597d9065e625c6298021f 100644 (file)
--- a/bsd/sys/exec.h
+++ b/bsd/sys/exec.h
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 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 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@
  */
@@ -63,6 +66,9 @@
 #ifndef        _SYS_EXEC_H_
 #define        _SYS_EXEC_H_
 
+#include <sys/appleapiopts.h>
+
+#ifdef  __APPLE_API_OBSOLETE
 /*
  * The following structure is found at the top of the user stack of each
  * user process. The ps program uses it to locate argv and environment
@@ -78,9 +84,12 @@ struct ps_strings {
        int     ps_nenvstr;     /* the number of environment strings */
 };
 
+#endif /* __APPLE_API_OBSOLETE */
+
 #include <machine/exec.h>
 
 #ifdef KERNEL
+#ifdef __APPLE_API_PRIVATE
 /*
  * Arguments to the exec system call.
  */
@@ -89,6 +98,8 @@ struct execve_args {
        char    **argp;
        char    **envp;
 };
+#endif /*__APPLE_API_PRIVATE */
 #endif /* KERNEL */
+
 #endif /* !_SYS_EXEC_H_ */