--- Libc/Libc-583/include/protocols/timed.h
+++ Libc/Libc-262/include/protocols/timed.h
@@ -1,22 +1,21 @@
 /*
- * Copyright (c) 2000, 2006 Apple Computer, 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@
  */
@@ -65,24 +64,15 @@
 #define	TSPVERSION	1
 #define ANYADDR 	NULL
 
-#ifdef __LP64__
-#define __need_struct_timeval32
-#include <sys/_structs.h>
-#endif /* __LP64__ */
-
 struct tsp {
-	unsigned char	tsp_type;
-	unsigned char	tsp_vers;
-	unsigned short	tsp_seq;
+	u_char	tsp_type;
+	u_char	tsp_vers;
+	u_short	tsp_seq;
 	union {
-#ifdef __LP64__
-		struct timeval32 tspu_time;
-#else /* !__LP64__ */
 		struct timeval tspu_time;
-#endif /* __LP64__ */
 		char tspu_hopcnt;
 	} tsp_u;
-	char 		tsp_name[MAXHOSTNAMELEN];
+	char tsp_name[MAXHOSTNAMELEN];
 };
 
 #define	tsp_time	tsp_u.tspu_time