Loading...
gen/nlist.c Libc-262.3.2 Libc-498
--- Libc/Libc-262.3.2/gen/nlist.c
+++ Libc/Libc-498/gen/nlist.c
@@ -2,8 +2,6 @@
  * 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
@@ -23,7 +21,8 @@
  * @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
@@ -54,6 +53,8 @@
  * SUCH DAMAGE.
  */
 
+/* temporarily comment this file out for LP64, until code can be modified */
+#ifndef __LP64__
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -101,6 +102,8 @@
  */
 #define	CPUSUBTYPE_SUPPORT	0
 
+int __fdnlist(int fd, struct nlist *list);
+
 /*
  * nlist - retreive attributes from name list (string table version)
  */
@@ -129,7 +132,7 @@
 {
 	register struct nlist *p, *q;
 	register char *s1, *s2;
-	register n, m;
+	register int n, m;
 	int maxlen, nreq;
 	off_t sa;		/* symbol address */
 	off_t ss;		/* start of strings */
@@ -212,7 +215,7 @@
 #if	CPUSUBTYPE_SUPPORT
 		fap = cpusubtype_getbestarch(hbi.cpu_type, hbi.cpu_subtype,
 					     fat_archs, fh.nfat_arch);
-#else	CPUSUBTYPE_SUPPORT
+#else
 #warning	Use the cpusubtype functions!!!
 		fap = NULL;
 		for (i = 0; i < fh.nfat_arch; i++) {
@@ -221,7 +224,7 @@
 				break;
 			}
 		}
-#endif	CPUSUBTYPE_SUPPORT
+#endif	/* CPUSUBTYPE_SUPPORT */
 		if (!fap) {
 			free(fat_archs);
 			return (-1);
@@ -333,3 +336,5 @@
 	}
 	return (nreq);
 }
+
+#endif /* !__LP64__ */