Module Name: src
Committed By: mrg
Date: Mon Mar 22 01:29:30 UTC 2010
Modified Files:
src/lib/libc: Makefile.inc
src/lib/libcompat: Makefile
src/usr.bin/kdump: mkioctls
src/usr.bin/xlint/xlint: xlint.c
Log Message:
convert -idirafter to -isystem, as recommended by cgd in PR 11843.
most of the list in that PR were already done.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/Makefile.inc
cvs rdiff -u -r1.29 -r1.30 src/lib/libcompat/Makefile
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/kdump/mkioctls
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/xlint/xlint/xlint.c
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/Makefile.inc
diff -u src/lib/libc/Makefile.inc:1.4 src/lib/libc/Makefile.inc:1.5
--- src/lib/libc/Makefile.inc:1.4 Sun Oct 26 07:42:09 2008
+++ src/lib/libc/Makefile.inc Mon Mar 22 01:29:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2008/10/26 07:42:09 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2010/03/22 01:29:29 mrg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -52,7 +52,7 @@
ARCHDIR= ${.CURDIR}/arch/${ARCHSUBDIR}
AFLAGS+= -I${ARCHDIR}
.if defined(DESTDIR)
-AFLAGS+= -nostdinc -idirafter ${DESTDIR}/usr/include
+AFLAGS+= -nostdinc -isystem ${DESTDIR}/usr/include
.endif
CLEANFILES+= tags
Index: src/lib/libcompat/Makefile
diff -u src/lib/libcompat/Makefile:1.29 src/lib/libcompat/Makefile:1.30
--- src/lib/libcompat/Makefile:1.29 Sat Feb 14 13:52:51 2009
+++ src/lib/libcompat/Makefile Mon Mar 22 01:29:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/02/14 13:52:51 abs Exp $
+# $NetBSD: Makefile,v 1.30 2010/03/22 01:29:30 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
CPPFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -D__LIBCOMPAT_SOURCE__
AFLAGS+=-I${NETBSDSRCDIR}/lib/libc/arch/${MACHINE_ARCH}
.if defined(DESTDIR)
-AFLAGS+=-nostdinc -idirafter ${DESTDIR}/usr/include
+AFLAGS+=-nostdinc -isystem ${DESTDIR}/usr/include
.endif
.PATH: ${.CURDIR}/4.1/${MACHINE_ARCH} ${.CURDIR}/4.1 \
Index: src/usr.bin/kdump/mkioctls
diff -u src/usr.bin/kdump/mkioctls:1.38 src/usr.bin/kdump/mkioctls:1.39
--- src/usr.bin/kdump/mkioctls:1.38 Sat Oct 25 22:18:15 2008
+++ src/usr.bin/kdump/mkioctls Mon Mar 22 01:29:30 2010
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkioctls,v 1.38 2008/10/25 22:18:15 apb Exp $
+# $NetBSD: mkioctls,v 1.39 2010/03/22 01:29:30 mrg Exp $
#
# Copyright (c) 1994
# The Regents of the University of California. All rights reserved.
@@ -82,7 +82,7 @@
echo "#include <$i>"
done | ${SED} -e "s,${DESTDIR}/usr/include/,,g"
-${CC} -E -nostdinc -idirafter ${DESTDIR}/usr/include -dM ${1+"$@"} | \
+${CC} -E -nostdinc -isystem ${DESTDIR}/usr/include -dM ${1+"$@"} | \
${AWK} '
BEGIN {
keep["SLIOCGUNIT"] = 1; # Same as PPPIOCGASYNCMAP
Index: src/usr.bin/xlint/xlint/xlint.c
diff -u src/usr.bin/xlint/xlint/xlint.c:1.42 src/usr.bin/xlint/xlint/xlint.c:1.43
--- src/usr.bin/xlint/xlint/xlint.c:1.42 Wed Apr 15 01:20:57 2009
+++ src/usr.bin/xlint/xlint/xlint.c Mon Mar 22 01:29:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.42 2009/04/15 01:20:57 christos Exp $ */
+/* $NetBSD: xlint.c,v 1.43 2010/03/22 01:29:30 mrg Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: xlint.c,v 1.42 2009/04/15 01:20:57 christos Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.43 2010/03/22 01:29:30 mrg Exp $");
#endif
#include <sys/param.h>
@@ -479,7 +479,7 @@
usage();
dflag = 1;
appcstrg(&cflags, "-nostdinc");
- appcstrg(&cflags, "-idirafter");
+ appcstrg(&cflags, "-isystem");
appcstrg(&cflags, optarg);
break;
