--- Libc/Libc-583/gen/nlist.c
+++ Libc/Libc-262.3.2/gen/nlist.c
@@ -1,7 +1,9 @@
 /*
- * Copyright (c) 1999, 2008 Apple 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
@@ -21,8 +23,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 /*
- * Copyright (c) 1989, 1993
- * The Regents of the University of California.  All rights reserved.
+ *
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -53,8 +54,6 @@
  * SUCH DAMAGE.
  */
 
-/* temporarily comment this file out for LP64, until code can be modified */
-#ifndef __LP64__
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -102,8 +101,6 @@
  */
 #define	CPUSUBTYPE_SUPPORT	0
 
-int __fdnlist(int fd, struct nlist *list);
-
 /*
  * nlist - retreive attributes from name list (string table version)
  */
@@ -132,7 +129,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 */
@@ -151,13 +148,13 @@
 			maxlen = n;
 	}
 	if (read(fd, (char *)&buf, sizeof(buf)) != sizeof(buf) ||
-	    (N_BADMAG(buf) && *((uint32_t *)&buf) != MH_MAGIC &&
-	     OSSwapBigToHostInt32(*((uint32_t *)&buf)) != FAT_MAGIC)) {
+	    (N_BADMAG(buf) && *((long *)&buf) != MH_MAGIC &&
+	     NXSwapBigLongToHost(*((long *)&buf)) != FAT_MAGIC)) {
 		return (-1);
 	}
 
 	/* Deal with fat file if necessary */
-	if (OSSwapBigToHostInt32(*((uint32_t *)&buf)) == FAT_MAGIC) {
+	if (NXSwapBigLongToHost(*((long *)&buf)) == FAT_MAGIC) {
 		struct host_basic_info hbi;
 		struct fat_header fh;
 		struct fat_arch *fat_archs, *fap;
@@ -180,7 +177,7 @@
 		}
 
 		/* Convert fat_narchs to host byte order */
-		fh.nfat_arch = OSSwapBigToHostInt32(fh.nfat_arch);
+		fh.nfat_arch = NXSwapBigLongToHost(fh.nfat_arch);
 
 		/* Read in the fat archs */
 		fat_archs = (struct fat_arch *)malloc(fh.nfat_arch *
@@ -201,21 +198,21 @@
 		 */
 		for (i = 0; i < fh.nfat_arch; i++) {
 			fat_archs[i].cputype =
-				OSSwapBigToHostInt32(fat_archs[i].cputype);
+				NXSwapBigLongToHost(fat_archs[i].cputype);
 			fat_archs[i].cpusubtype =
-			      OSSwapBigToHostInt32(fat_archs[i].cpusubtype);
+			      NXSwapBigLongToHost(fat_archs[i].cpusubtype);
 			fat_archs[i].offset =
-				OSSwapBigToHostInt32(fat_archs[i].offset);
+				NXSwapBigLongToHost(fat_archs[i].offset);
 			fat_archs[i].size =
-				OSSwapBigToHostInt32(fat_archs[i].size);
+				NXSwapBigLongToHost(fat_archs[i].size);
 			fat_archs[i].align =
-				OSSwapBigToHostInt32(fat_archs[i].align);
+				NXSwapBigLongToHost(fat_archs[i].align);
 		}
 
 #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++) {
@@ -224,7 +221,7 @@
 				break;
 			}
 		}
-#endif	/* CPUSUBTYPE_SUPPORT */
+#endif	CPUSUBTYPE_SUPPORT
 		if (!fap) {
 			free(fat_archs);
 			return (-1);
@@ -239,7 +236,7 @@
 		}
 	}
 		
-	if (*((uint32_t *)&buf) == MH_MAGIC) {
+	if (*((long *)&buf) == MH_MAGIC) {
 	    struct mach_header mh;
 	    struct load_command *load_commands, *lcp;
 	    struct symtab_command *stp;
@@ -261,7 +258,7 @@
 		stp = NULL;
 		lcp = load_commands;
 		for (i = 0; i < mh.ncmds; i++) {
-			if (lcp->cmdsize % sizeof(uint32_t) != 0 ||
+			if (lcp->cmdsize % sizeof(long) != 0 ||
 			    lcp->cmdsize <= 0 ||
 			    (char *)lcp + lcp->cmdsize >
 			    (char *)load_commands + mh.sizeofcmds) {
@@ -297,7 +294,7 @@
 
 	lseek(fd, sa, SEEK_SET);
 	while (n) {
-		off_t savpos;
+		long savpos;
 
 		m = sizeof (space);
 		if (n < m)
@@ -336,5 +333,3 @@
 	}
 	return (nreq);
 }
-
-#endif /* !__LP64__ */