xnu-3247.1.106.tar.gz

[apple/xnu.git] / EXTERNAL_HEADERS / mach-o / fat.h

diff --git a/EXTERNAL_HEADERS/mach-o/fat.h b/EXTERNAL_HEADERS/mach-o/fat.h
index e964a19651a9aa1197f2267a5910c258e2aa8f4f..e2bcf433d518ee192244d31ce063611ec2f9d3fa 100644 (file)
--- a/EXTERNAL_HEADERS/mach-o/fat.h
+++ b/EXTERNAL_HEADERS/mach-o/fat.h
@@ -1,24 +1,27 @@
 /*
 /*

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

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @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 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.

  * 
  * 

- * This 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

  * 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_LICENSE_HEADER_END@
  */

+#ifndef _MACH_O_FAT_H_
+#define _MACH_O_FAT_H_

 /*
  * This header file describes the structures of the file format for "fat"
  * architecture specific file (wrapper design).  At the begining of the file
 /*
  * This header file describes the structures of the file format for "fat"
  * architecture specific file (wrapper design).  At the begining of the file


@@ -38,37 +41,24 @@
  * <mach/machine.h> is needed here for the cpu_type_t and cpu_subtype_t types
  * and contains the constants for the possible values of these types.
  */
  * <mach/machine.h> is needed here for the cpu_type_t and cpu_subtype_t types
  * and contains the constants for the possible values of these types.
  */

+#include <stdint.h>

 #include <mach/machine.h>
 #include <architecture/byte_order.h>
 
 #define FAT_MAGIC      0xcafebabe
 #include <mach/machine.h>
 #include <architecture/byte_order.h>
 
 #define FAT_MAGIC      0xcafebabe

-#define FAT_CIGAM      NXSwapLong(FAT_MAGIC)
+#define FAT_CIGAM      0xbebafeca      /* NXSwapLong(FAT_MAGIC) */

 
 struct fat_header {
 
 struct fat_header {

-       unsigned long   magic;          /* FAT_MAGIC */
-       unsigned long   nfat_arch;      /* number of structs that follow */
+       uint32_t        magic;          /* FAT_MAGIC */
+       uint32_t        nfat_arch;      /* number of structs that follow */

 };
 
 struct fat_arch {
        cpu_type_t      cputype;        /* cpu specifier (int) */
        cpu_subtype_t   cpusubtype;     /* machine specifier (int) */
 };
 
 struct fat_arch {
        cpu_type_t      cputype;        /* cpu specifier (int) */
        cpu_subtype_t   cpusubtype;     /* machine specifier (int) */

-       unsigned long   offset;         /* file offset to this object file */
-       unsigned long   size;           /* size of this object file */
-       unsigned long   align;          /* alignment as a power of 2 */
+       uint32_t        offset;         /* file offset to this object file */
+       uint32_t        size;           /* size of this object file */
+       uint32_t        align;          /* alignment as a power of 2 */

 };
 
 };
 

-#ifdef KERNEL
-
-#include <mach/mach_types.h>
-
-struct vnode;
-
-/* XXX return type should be load_return_t, but mach_loader.h is not in scope */
-int fatfile_getarch_affinity(struct vnode *vp, vm_offset_t data_ptr,
-               struct fat_arch *archret, int affinity);
-int fatfile_getarch(struct vnode *vp, vm_offset_t data_ptr,
-               struct fat_arch *archret);
-int fatfile_getarch_with_bits(struct vnode *vp, integer_t archbits,
-               vm_offset_t data_ptr, struct fat_arch *archret);
-
-#endif /* KERNEL */
+#endif /* _MACH_O_FAT_H_ */