X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/5b2abdfbf4211b6592cdd02b9507555a0ecbb04b..8e029c653e0567df7ce6933dde41f5830dbbbcda:/gen/nlist.c

diff --git a/gen/nlist.c b/gen/nlist.c
index ab17ad2..0d2e0a4 100644
--- a/gen/nlist.c
+++ b/gen/nlist.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -51,6 +52,8 @@
  * SUCH DAMAGE.
  */
 
+/* temporarily comment this file out for LP64, until code can be modified */
+#ifndef __LP64__
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -98,6 +101,8 @@ unsigned long	a_drsize;	/* size of data relocation */
  */
 #define	CPUSUBTYPE_SUPPORT	0
 
+int __fdnlist(int fd, struct nlist *list);
+
 /*
  * nlist - retreive attributes from name list (string table version)
  */
@@ -126,7 +131,7 @@ __fdnlist(fd, list)
 {
 	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 */
@@ -209,7 +214,7 @@ __fdnlist(fd, list)
 #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++) {
@@ -218,7 +223,7 @@ __fdnlist(fd, list)
 				break;
 			}
 		}
-#endif	CPUSUBTYPE_SUPPORT
+#endif	/* CPUSUBTYPE_SUPPORT */
 		if (!fap) {
 			free(fat_archs);
 			return (-1);
@@ -330,3 +335,5 @@ __fdnlist(fd, list)
 	}
 	return (nreq);
 }
+
+#endif /* !__LP64__ */