[RFC] removing broken includes

[Alexander Best]

On Fri Feb  4 11, John Baldwin wrote:
> On Thursday, February 03, 2011 5:12:57 pm Alexander Best wrote:
> > hi everybody,
> > 
> > i've started to check the source for broken includes, such as the one fixed in
> > r218189. so far i've run through arch=amd64 and found only two broken includes,
> > which should be fixed by the attached patch. the commands i'm using are:
> 
> The sys/conf/files fix should definitely go in.

as a side note: while checking the tinderbox output i saw a few gas related
warnings, which complained about VCS IDs being spammed to object files.

the following patch should take care of those cases (at least for archs amd64
and i386).

also i noticed a lot of these warnings:

usr/subversion-src/lib/libc/i386/string/memcpy.S:7: Warning: ignoring incorrect section type for .note.GNU-stack

i think i've seen some recent commits dealing with that new section.

cheers.
alex

> 
> -- 
> John Baldwin

-- 
a13x
-------------- next part --------------
Index: sbin/routed/rtquery/rtquery.c
===================================================================
--- sbin/routed/rtquery/rtquery.c	(revision 218217)
+++ sbin/routed/rtquery/rtquery.c	(working copy)
@@ -49,6 +49,7 @@
 #include <bstring.h>
 #endif
 
+#if 0
 #define UNUSED __attribute__((unused))
 #ifndef __RCSID
 #define __RCSID(_s) static const char rcsid[] UNUSED = _s
@@ -67,6 +68,7 @@
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
 #endif
+#endif
 
 #ifndef sgi
 #define _HAVE_SIN_LEN
Index: contrib/lukemftp/src/main.c
===================================================================
--- contrib/lukemftp/src/main.c	(revision 218217)
+++ contrib/lukemftp/src/main.c	(working copy)
@@ -96,8 +96,10 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
+#if 0
 __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n");
+#endif
 #endif /* not lint */
 
 #ifndef lint