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 3c6728cdd92aa45af4fb99e4f5887dd5c176c4e5..e2bcf433d518ee192244d31ce063611ec2f9d3fa 100644 (file)
--- a/EXTERNAL_HEADERS/mach-o/fat.h
+++ b/EXTERNAL_HEADERS/mach-o/fat.h
@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * 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
@@ -22,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
@@ -41,22 +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 */
 };
 
+#endif /* _MACH_O_FAT_H_ */