xnu-3247.1.106.tar.gz

[apple/xnu.git] / bsd / machine / disklabel.h

diff --git a/bsd/machine/disklabel.h b/bsd/machine/disklabel.h
index 492731dd37ee9812e3b92ee1b66be53d7919a675..490bbda8aad1704e0d4376540c31219155bcf6c0 100644 (file)
--- a/bsd/machine/disklabel.h
+++ b/bsd/machine/disklabel.h
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
  * 
  * 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.
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,19 +23,15 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 #ifndef _BSD_MACHINE_CPU_H_
 #define _BSD_MACHINE_CPU_H_
 
  */
 #ifndef _BSD_MACHINE_CPU_H_
 #define _BSD_MACHINE_CPU_H_
 

-
-#if defined (__ppc__)
-#include "ppc/disklabel.h"
-#elif defined (__i386__)
+#if defined (__i386__) || defined(__x86_64__)

 #include "i386/disklabel.h"
 #else
 #error architecture not supported
 #endif
 
 #include "i386/disklabel.h"
 #else
 #error architecture not supported
 #endif
 

-

 #endif /* _BSD_MACHINE_CPU_H_ */
 #endif /* _BSD_MACHINE_CPU_H_ */