Module Name: src
Committed By: matt
Date: Sun Aug 16 03:56:26 UTC 2009
Modified Files:
src/lib/libc/gen: nlist_aout.c nlist_private.h
Log Message:
Only include <sys/exec_aout.h> if NLIST_AOUT is defined.
Don't define NLIST_AOUT for mips anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/gen/nlist_aout.c
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/gen/nlist_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/nlist_aout.c
diff -u src/lib/libc/gen/nlist_aout.c:1.18 src/lib/libc/gen/nlist_aout.c:1.19
--- src/lib/libc/gen/nlist_aout.c:1.18 Mon Feb 16 10:40:45 2009
+++ src/lib/libc/gen/nlist_aout.c Sun Aug 16 03:56:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_aout.c,v 1.18 2009/02/16 10:40:45 lukem Exp $ */
+/* $NetBSD: nlist_aout.c,v 1.19 2009/08/16 03:56:26 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -66,7 +66,7 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: nlist_aout.c,v 1.18 2009/02/16 10:40:45 lukem Exp $");
+__RCSID("$NetBSD: nlist_aout.c,v 1.19 2009/08/16 03:56:26 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -87,6 +87,8 @@
#include "nlist_private.h"
#ifdef NLIST_AOUT
+#include <sys/exec_aout.h>
+
int
__fdnlist_aout(fd, list)
int fd;
Index: src/lib/libc/gen/nlist_private.h
diff -u src/lib/libc/gen/nlist_private.h:1.17 src/lib/libc/gen/nlist_private.h:1.18
--- src/lib/libc/gen/nlist_private.h:1.17 Sat Jul 26 19:24:43 2003
+++ src/lib/libc/gen/nlist_private.h Sun Aug 16 03:56:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_private.h,v 1.17 2003/07/26 19:24:43 salo Exp $ */
+/* $NetBSD: nlist_private.h,v 1.18 2009/08/16 03:56:26 matt Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -41,7 +41,6 @@
# define NLIST_ELF64
# define NLIST_ELF32
#elif defined(__mips__)
-# define NLIST_AOUT
# define NLIST_ECOFF
# define NLIST_ELF32
#elif defined(__arm__) || defined(__i386__) || defined (__m68k__) || \
