X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..3e170ce000f1506b7b5d2c5c7faec85ceabb573d:/EXTERNAL_HEADERS/mach-o/fat.h?ds=sidebyside

diff --git a/EXTERNAL_HEADERS/mach-o/fat.h b/EXTERNAL_HEADERS/mach-o/fat.h
index 71e4d6b38..e2bcf433d 100644
--- a/EXTERNAL_HEADERS/mach-o/fat.h
+++ b/EXTERNAL_HEADERS/mach-o/fat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -20,6 +20,8 @@
  * 
  * @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
@@ -39,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.
  */
+#include <stdint.h>
 #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 {
-	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) */
-	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_ */