--- Libc/Libc-391/gen/nlist.c
+++ Libc/Libc-262/gen/nlist.c
@@ -3,20 +3,19 @@
  *
  * @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@
  */
@@ -52,8 +51,6 @@
  * SUCH DAMAGE.
  */
 
-/* temporarily comment this file out for LP64, until code can be modified */
-#ifndef __LP64__
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -101,8 +98,6 @@
  */
 #define	CPUSUBTYPE_SUPPORT	0
 
-int __fdnlist(int fd, struct nlist *list);
-
 /*
  * nlist - retreive attributes from name list (string table version)
  */
@@ -131,7 +126,7 @@
 {
 	register struct nlist *p, *q;
 	register char *s1, *s2;
-	register int n, m;
+	register n, m;
 	int maxlen, nreq;
 	off_t sa;		/* symbol address */
 	off_t ss;		/* start of strings */
@@ -214,7 +209,7 @@
 #if	CPUSUBTYPE_SUPPORT
 		fap = cpusubtype_getbestarch(hbi.cpu_type, hbi.cpu_subtype,
 					     fat_archs, fh.nfat_arch);
-#else
+#else	CPUSUBTYPE_SUPPORT
 #warning	Use the cpusubtype functions!!!
 		fap = NULL;
 		for (i = 0; i < fh.nfat_arch; i++) {
@@ -223,7 +218,7 @@
 				break;
 			}
 		}
-#endif	/* CPUSUBTYPE_SUPPORT */
+#endif	CPUSUBTYPE_SUPPORT
 		if (!fap) {
 			free(fat_archs);
 			return (-1);
@@ -335,5 +330,3 @@
 	}
 	return (nreq);
 }
-
-#endif /* !__LP64__ */