--- Libc/Libc-583/include/protocols/dumprestore.h
+++ Libc/Libc-262/include/protocols/dumprestore.h
@@ -1,22 +1,21 @@
 /*
- * Copyright (c) 2000, 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_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
- * 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 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.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -89,51 +88,25 @@
 union u_spcl {
 	char dummy[TP_BSIZE];
 	struct	s_spcl {
-#ifdef __LP64__
-		int	c_type;		    /* record type (see below) */
-		int	c_date;		    /* date of this dump */
-		int	c_ddate;	    /* date of previous dump */
-		int	c_volume;	    /* dump volume number */
-#else /* !__LP64__ */
 		long	c_type;		    /* record type (see below) */
 		time_t	c_date;		    /* date of this dump */
 		time_t	c_ddate;	    /* date of previous dump */
 		long	c_volume;	    /* dump volume number */
-#endif /* __LP64__ */
 		daddr_t	c_tapea;	    /* logical block of this record */
-		unsigned int c_inumber;	    /* number of inode; truncation can occur for 64-bit ino_t */
-#ifdef __LP64__
-		int	c_magic;	    /* magic number (see above) */
-		int	c_checksum;	    /* record checksum */
-#else /* !__LP64__ */
+		ino_t	c_inumber;	    /* number of inode */
 		long	c_magic;	    /* magic number (see above) */
 		long	c_checksum;	    /* record checksum */
-#endif /* __LP64__ */
 		struct	dinode	c_dinode;   /* ownership and mode of inode */
-#ifdef __LP64__
-		int	c_count;	    /* number of valid c_addr entries */
-#else /* !__LP64__ */
 		long	c_count;	    /* number of valid c_addr entries */
-#endif /* __LP64__ */
 		char	c_addr[TP_NINDIR];  /* 1 => data; 0 => hole in inode */
 		char	c_label[LBLSIZE];   /* dump label */
-#ifdef __LP64__
-		int	c_level;	    /* level of this dump */
-#else /* !__LP64__ */
 		long	c_level;	    /* level of this dump */
-#endif /* __LP64__ */
 		char	c_filesys[NAMELEN]; /* name of dumpped file system */
 		char	c_dev[NAMELEN];	    /* name of dumpped device */
 		char	c_host[NAMELEN];    /* name of dumpped host */
-#ifdef __LP64__
-		int	c_flags;	    /* additional information */
-		int	c_firstrec;	    /* first record on volume */
-		int	c_spare[32];	    /* reserved for future uses */
-#else /* !__LP64__ */
 		long	c_flags;	    /* additional information */
 		long	c_firstrec;	    /* first record on volume */
 		long	c_spare[32];	    /* reserved for future uses */
-#endif /* __LP64__ */
 	} s_spcl;
 };