Sat Jan 23 21:22:50 2016 UTC ()
Define _KERNTYPES for things that need it.
(christos)
diff -r1.3 -r1.4 src/external/bsd/ipf/bin/ipftest/Makefile
diff -r1.5 -r1.6 src/external/bsd/iscsi/initiator/Makefile
diff -r1.1 -r1.2 src/external/bsd/libproc/Makefile.inc
diff -r1.9 -r1.10 src/external/bsd/top/bin/Makefile
diff -r1.2 -r1.3 src/external/cddl/osnet/Makefile.inc
diff -r1.3 -r1.4 src/external/cddl/osnet/lib/Makefile.inc
diff -r1.1 -r1.2 src/external/cddl/osnet/sbin/Makefile.inc
diff -r1.1 -r1.2 src/external/cddl/osnet/usr.bin/Makefile.inc
diff -r1.1 -r1.2 src/external/cddl/osnet/usr.sbin/Makefile.inc
diff -r1.29 -r1.30 src/lib/libarch/Makefile
diff -r1.6 -r1.7 src/lib/libkern/Makefile
diff -r1.3 -r1.4 src/lib/libp2k/Makefile
diff -r1.10 -r1.11 src/lib/libperfuse/Makefile
diff -r1.25 -r1.26 src/lib/libpuffs/Makefile
diff -r1.9 -r1.10 src/lib/librefuse/Makefile
diff -r1.10 -r1.11 src/lib/librumpclient/Makefile
diff -r1.16 -r1.17 src/lib/librumphijack/Makefile
diff -r1.23 -r1.24 src/lib/librumpuser/Makefile
diff -r1.7 -r1.8 src/lib/libukfs/Makefile
diff -r1.129 -r1.130 src/libexec/ld.elf_so/Makefile
diff -r1.21 -r1.22 src/libexec/rpc.rstatd/Makefile
diff -r1.2 -r1.3 src/sbin/dkscan_bsdlabel/Makefile
diff -r1.8 -r1.9 src/sbin/fsirand/Makefile
diff -r1.31 -r1.32 src/sbin/mount/Makefile
diff -r1.25 -r1.26 src/sbin/mount_portal/Makefile
diff -r1.1 -r1.2 src/sbin/mount_puffs/Makefile
diff -r1.293 -r1.294 src/share/mk/bsd.prog.mk
diff -r1.67 -r1.68 src/sys/arch/i386/stand/boot/Makefile.boot
diff -r1.28 -r1.29 src/sys/arch/i386/stand/dosboot/Makefile
diff -r1.22 -r1.23 src/sys/arch/i386/stand/pxeboot/Makefile
diff -r1.1 -r1.2 src/tests/dev/Makefile.inc
diff -r1.4 -r1.5 src/tests/dev/audio/Makefile
diff -r1.2 -r1.3 src/tests/dev/dm/Makefile
diff -r1.5 -r1.6 src/tests/dev/md/Makefile
diff -r1.6 -r1.7 src/tests/dev/scsipi/Makefile
diff -r1.3 -r1.4 src/tests/dev/sysmon/Makefile
diff -r1.1 -r1.2 src/tests/fs/Makefile.inc
diff -r0 -r1.1 src/tests/fs/nfs/Makefile.inc
diff -r1.4 -r1.5 src/tests/fs/puffs/h_dtfs/Makefile
diff -r1.8 -r1.9 src/tests/include/sys/Makefile
diff -r1.37 -r1.38 src/tests/kernel/Makefile
diff -r1.2 -r1.3 src/tests/kernel/tty/Makefile
diff -r1.39 -r1.40 src/tests/lib/libc/sys/Makefile
diff -r1.5 -r1.6 src/tests/lib/librumpclient/Makefile
diff -r1.3 -r1.4 src/tests/lib/semaphore/pthread/Makefile
diff -r1.11 -r1.12 src/tests/modules/Makefile
diff -r1.1 -r1.2 src/tests/modules/Makefile.inc
diff -r1.1 -r1.2 src/tests/net/Makefile.inc
diff -r1.1 -r1.2 src/tests/rump/Makefile.inc
diff -r1.31 -r1.32 src/usr.bin/kdump/Makefile
diff -r1.29 -r1.30 src/usr.bin/ktruss/Makefile
diff -r1.6 -r1.7 src/usr.bin/ldd/Makefile.inc
diff -r1.6 -r1.7 src/usr.bin/pmap/Makefile
diff -r1.7 -r1.8 src/usr.bin/rump_allserver/Makefile
diff -r1.1 -r1.2 src/usr.bin/rump_dhcpclient/Makefile
diff -r1.1 -r1.2 src/usr.bin/rump_halt/Makefile
diff -r1.8 -r1.9 src/usr.bin/rump_server/Makefile
diff -r1.37 -r1.38 src/usr.bin/systat/Makefile
diff -r1.6 -r1.7 src/usr.sbin/Makefile.inc
diff -r1.5 -r1.6 src/usr.sbin/acpitools/acpidump/Makefile
diff -r1.3 -r1.4 src/usr.sbin/acpitools/amldb/Makefile
diff -r1.7 -r1.8 src/usr.sbin/cpuctl/Makefile
diff -r1.5 -r1.6 src/usr.sbin/perfused/Makefile
diff -r1.14 -r1.15 src/usr.sbin/puffs/Makefile.inc
--- src/external/bsd/ipf/bin/ipftest/Makefile 2015/01/17 11:25:30 1.3
+++ src/external/bsd/ipf/bin/ipftest/Makefile 2016/01/23 21:22:45 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/01/17 11:25:30 martin Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:45 christos Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
CPPFLAGS+= -DIPFILTER_LOG -DIPFILTER_LOOKUP \
-DIPFILTER_SYNC -DIPFILTER_CKSUM \
- -I.
+ -I. -D_KERNTYPES
COPTS.radix.c= -Wno-error
COPTS+= -fno-strict-aliasing
--- src/external/bsd/iscsi/initiator/Makefile 2011/08/17 09:24:23 1.5
+++ src/external/bsd/iscsi/initiator/Makefile 2016/01/23 21:22:45 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/17 09:24:23 christos Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:45 christos Exp $
.sinclude "${.CURDIR}/../Makefile.inc"
@@ -13,7 +13,7 @@
SRCS=iscsi-initiator.c virtdir.c libkmod.c
LDADD+= -lrefuse -liscsi -lpuffs
DPADD+= ${LIBREFUSE} ${LIBISCSI} ${LIBPUFFS}
-CPPFLAGS+= -I${ISCSIDIST}/include
+CPPFLAGS+= -I${ISCSIDIST}/include -D_KERNTYPES
CPPFLAGS+= -pthread
LDFLAGS+= -pthread
MAN=iscsi-initiator.8
--- src/external/bsd/libproc/Makefile.inc 2015/09/24 14:12:48 1.1
+++ src/external/bsd/libproc/Makefile.inc 2016/01/23 21:22:45 1.2
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2015/09/24 14:12:48 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:45 christos Exp $
LIBPROCDIR:= ${.PARSEDIR}/dist
+CPPFLAGS+= -D_KERNTYPES
--- src/external/bsd/top/bin/Makefile 2013/03/21 21:43:22 1.9
+++ src/external/bsd/top/bin/Makefile 2016/01/23 21:22:45 1.10
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/03/21 21:43:22 christos Exp $
+# $NetBSD: Makefile,v 1.10 2016/01/23 21:22:45 christos Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@
WARNS= 4
CWARNFLAGS+= -Wno-missing-noreturn
-CPPFLAGS+=-I${.CURDIR} -I${TOPDIR} -I.
+CPPFLAGS+=-I${.CURDIR} -I${TOPDIR} -I. -D_KERNTYPES
SRCS= color.c commands.c display.c hash.c screen.c \
top.c username.c utils.c version.c m_netbsd.c
DPSRCS+=sigdesc.h config.h
--- src/external/cddl/osnet/Makefile.inc 2015/02/07 20:30:03 1.2
+++ src/external/cddl/osnet/Makefile.inc 2016/01/23 21:22:45 1.3
@@ -5,4 +5,4 @@
OPENSOLARIS_USR_DISTDIR=${OSNETDIR}/dist
OPENSOLARIS_SYS_DISTDIR=${OSNETDIR}/dist
-CPPFLAGS+=-Wno-unknown-pragmas -Wno-sign-compare
+CPPFLAGS+=-Wno-unknown-pragmas -Wno-sign-compare -D_KERNTYPES
--- src/external/cddl/osnet/lib/Makefile.inc 2010/02/21 01:46:34 1.3
+++ src/external/cddl/osnet/lib/Makefile.inc 2016/01/23 21:22:45 1.4
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/02/21 01:46:34 darran Exp $
+# $NetBSD: Makefile.inc,v 1.4 2016/01/23 21:22:45 christos Exp $
MKLINT=no
MKLINTLIB=no
+CPPFLAGS+= -D_KERNTYPES
--- src/external/cddl/osnet/sbin/Makefile.inc 2009/08/07 20:57:56 1.1
+++ src/external/cddl/osnet/sbin/Makefile.inc 2016/01/23 21:22:45 1.2
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:56 haad Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:45 christos Exp $
BINDIR?= /sbin
+CPPFLAGS+= -D_KERNTYPES
--- src/external/cddl/osnet/usr.bin/Makefile.inc 2009/08/07 20:57:59 1.1
+++ src/external/cddl/osnet/usr.bin/Makefile.inc 2016/01/23 21:22:46 1.2
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:59 haad Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:46 christos Exp $
BINDIR?= /usr/bin
+CPPFLAGS+= -D_KERNTYPES
--- src/external/cddl/osnet/usr.sbin/Makefile.inc 2009/08/07 20:57:59 1.1
+++ src/external/cddl/osnet/usr.sbin/Makefile.inc 2016/01/23 21:22:46 1.2
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:59 haad Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:46 christos Exp $
BINDIR?= /usr/sbin
+CPPFLAGS+= -D_KERNTYPES
--- src/lib/libarch/Makefile 2015/06/08 04:08:30 1.29
+++ src/lib/libarch/Makefile 2016/01/23 21:22:46 1.30
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/06/08 04:08:30 matt Exp $
+# $NetBSD: Makefile,v 1.30 2016/01/23 21:22:46 christos Exp $
.include <bsd.own.mk>
@@ -13,6 +13,7 @@
OBJS+= ${ASM}
POBJS+= ${ASM:.o=.po}
CLEANFILES+= ${ASM} ${POBJS}
+CPPFLAGS+= -D_KERNTYPES
LIBC_MACHINE_CPU?= ${MACHINE_CPU}
--- src/lib/libkern/Makefile 2013/08/25 14:20:30 1.6
+++ src/lib/libkern/Makefile 2016/01/23 21:22:46 1.7
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/08/25 14:20:30 matt Exp $
+# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:46 christos Exp $
.include <bsd.obj.mk> # Pull in OBJDIR name rules.
.include <bsd.own.mk>
@@ -18,6 +18,7 @@
COPTS+= -fno-unwind-tables
CWARNFLAGS+= -Werror
CWARNFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
+CPPFLAGS+= -D_KERNTYPES
### find out what to use for libkern
KERN_AS= library
--- src/lib/libp2k/Makefile 2013/09/11 23:04:10 1.3
+++ src/lib/libp2k/Makefile 2016/01/23 21:22:46 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:46 christos Exp $
#
LIB= p2k
@@ -9,6 +9,7 @@
INCS= p2k.h
INCSDIR= /usr/include/rump
+CPPFLAGS+= -D_KERNTYPES
SRCS= p2k.c
MAN= p2k.3
--- src/lib/libperfuse/Makefile 2012/09/06 16:39:07 1.10
+++ src/lib/libperfuse/Makefile 2016/01/23 21:22:46 1.11
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/09/06 16:39:07 riz Exp $
+# $NetBSD: Makefile,v 1.11 2016/01/23 21:22:46 christos Exp $
LIB= perfuse
LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs
@@ -8,7 +8,7 @@
CWARNFLAGS.clang+= -Wno-format-security
#CFLAGS+= ${PERFUSE_OPT_DEBUG_FLAGS}
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libpuffs
SRCS= perfuse.c ops.c subr.c debug.c
MAN= libperfuse.3
--- src/lib/libpuffs/Makefile 2012/03/21 05:37:43 1.25
+++ src/lib/libpuffs/Makefile 2016/01/23 21:22:46 1.26
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/03/21 05:37:43 matt Exp $
+# $NetBSD: Makefile,v 1.26 2016/01/23 21:22:46 christos Exp $
#
.include <bsd.own.mk>
@@ -16,6 +16,7 @@
puffs_framebuf.3 puffs_node.3 puffs_ops.3 puffs_path.3
INCS= puffs.h puffsdump.h
INCSDIR= /usr/include
+CPPFLAGS+= -D_KERNTYPES
LINTFLAGS+=-S -w
.include <bsd.lib.mk>
--- src/lib/librefuse/Makefile 2012/03/21 05:37:43 1.9
+++ src/lib/librefuse/Makefile 2016/01/23 21:22:46 1.10
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/21 05:37:43 matt Exp $
+# $NetBSD: Makefile,v 1.10 2016/01/23 21:22:46 christos Exp $
USE_FORT?= yes # data driven bugs?
@@ -11,6 +11,7 @@
.endif
CFLAGS+= ${FUSE_OPT_DEBUG_FLAGS}
+CPPFLAGS+= -D_KERNTYPES
SRCS= refuse.c refuse_opt.c
MAN= refuse.3
WARNS?= 5
--- src/lib/librumpclient/Makefile 2013/09/10 17:39:10 1.10
+++ src/lib/librumpclient/Makefile 2016/01/23 21:22:46 1.11
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/09/10 17:39:10 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2016/01/23 21:22:46 christos Exp $
#
.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
@@ -17,7 +17,7 @@
LIBDPLIBS+= ${lib} lib
.endfor
-CPPFLAGS+= -DRUMP_CLIENT
+CPPFLAGS+= -DRUMP_CLIENT -D_KERNTYPES
CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR}
CPPFLAGS+= -I${.CURDIR}/../librumpuser
SRCS= rumpclient.c
--- src/lib/librumphijack/Makefile 2014/01/18 18:37:30 1.16
+++ src/lib/librumphijack/Makefile 2016/01/23 21:22:46 1.17
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/18 18:37:30 tron Exp $
+# $NetBSD: Makefile,v 1.17 2016/01/23 21:22:46 christos Exp $
#
LIB= rumphijack
@@ -10,7 +10,7 @@
SRCS= hijack.c hijackdlsym.c
-CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT
+CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES
WARNS?= 5
--- src/lib/librumpuser/Makefile 2014/11/09 17:39:37 1.23
+++ src/lib/librumpuser/Makefile 2016/01/23 21:22:46 1.24
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/11/09 17:39:37 pooka Exp $
+# $NetBSD: Makefile,v 1.24 2016/01/23 21:22:46 christos Exp $
#
.include <bsd.own.mk>
@@ -19,7 +19,7 @@
LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib
.endfor
-CPPFLAGS+= -DLIBRUMPUSER
+CPPFLAGS+= -DLIBRUMPUSER -D_KERNTYPES
#CPPFLAGS+= -D_DIAGNOSTIC
--- src/lib/libukfs/Makefile 2013/09/11 23:04:11 1.7
+++ src/lib/libukfs/Makefile 2016/01/23 21:22:47 1.8
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/09/11 23:04:11 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:47 christos Exp $
#
WARNS= 2
@@ -7,7 +7,7 @@
LIBDPLIBS+= rump ${.CURDIR}/../librump \
rumpvfs ${.CURDIR}/../librumpvfs \
pthread ${.CURDIR}/../libpthread
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
INCS= ukfs.h
INCSDIR= /usr/include/rump
--- src/libexec/ld.elf_so/Makefile 2014/09/19 17:43:33 1.129
+++ src/libexec/ld.elf_so/Makefile 2016/01/23 21:22:47 1.130
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2014/09/19 17:43:33 matt Exp $
+# $NetBSD: Makefile,v 1.130 2016/01/23 21:22:47 christos Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -91,7 +91,7 @@
BINDIR= ${SHLINKINSTALLDIR}
CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
-CPPFLAGS+= -I${.CURDIR} -I.
+CPPFLAGS+= -I${.CURDIR} -I. -D_KERNTYPES
CPPFLAGS+= -DRTLD_LOADER
CPPFLAGS+= -D_RTLD_SOURCE
CPPFLAGS+= -DCOMBRELOC
--- src/libexec/rpc.rstatd/Makefile 2014/06/02 19:29:58 1.21
+++ src/libexec/rpc.rstatd/Makefile 2016/01/23 21:22:47 1.22
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2014/06/02 19:29:58 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2016/01/23 21:22:47 christos Exp $
.include <bsd.own.mk>
PROG = rpc.rstatd
.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat
-CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat -D_KERNTYPES
SRCS = drvstats.c rstatd.c rstat_proc.c
MAN = rpc.rstatd.8
MLINKS= rpc.rstatd.8 rstatd.8
--- src/sbin/dkscan_bsdlabel/Makefile 2007/03/02 04:03:17 1.2
+++ src/sbin/dkscan_bsdlabel/Makefile 2016/01/23 21:22:47 1.3
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/03/02 04:03:17 riz Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:47 christos Exp $
PROG= dkscan_bsdlabel
MAN= dkscan_bsdlabel.8
-CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dev/dkwedge
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dev/dkwedge -D_KERNTYPES
SRCS= dkscan_bsdlabel.c dkscan_util.c
LDADD+= -lutil
--- src/sbin/fsirand/Makefile 2005/06/27 01:00:05 1.8
+++ src/sbin/fsirand/Makefile 2016/01/23 21:22:47 1.9
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/27 01:00:05 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:47 christos Exp $
.include <bsd.own.mk>
@@ -7,6 +7,7 @@
MAN= fsirand.8
LDADD+= -lutil
+CPPFLAGS+= -D_KERNTYPES
.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
--- src/sbin/mount/Makefile 2012/04/07 05:58:55 1.31
+++ src/sbin/mount/Makefile 2016/01/23 21:22:47 1.32
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2012/04/07 05:58:55 christos Exp $
+# $NetBSD: Makefile,v 1.32 2016/01/23 21:22:47 christos Exp $
# @(#)Makefile 8.6 (Berkeley) 5/8/95
.include <bsd.own.mk>
+CPPFLAGS+= -D_KERNTYPES
PROG= mount
MAN= mount.8
SRCS= mount.c vfslist.c
--- src/sbin/mount_portal/Makefile 2011/08/14 11:34:11 1.25
+++ src/sbin/mount_portal/Makefile 2016/01/23 21:22:47 1.26
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2011/08/14 11:34:11 christos Exp $
+# $NetBSD: Makefile,v 1.26 2016/01/23 21:22:47 christos Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
@@ -12,6 +12,7 @@
DPADD+=${LIBUTIL} ${LIBPUFFS}
LDADD+=-lutil -lpuffs
+CPPFLAGS+= -D_KERNTYPES
COPTS.pt_filter.c = -Wno-format-nonliteral
--- src/sbin/mount_puffs/Makefile 2010/01/14 21:25:48 1.1
+++ src/sbin/mount_puffs/Makefile 2016/01/23 21:22:47 1.2
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2010/01/14 21:25:48 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:47 christos Exp $
#
PROG= mount_puffs
DPADD+= ${LIBUTIL}
LDADD+= -lutil
+CPPFLAGS+= -D_KERNTYPES
MAN= mount_puffs.8
--- src/share/mk/bsd.prog.mk 2015/11/07 23:41:58 1.293
+++ src/share/mk/bsd.prog.mk 2016/01/23 21:22:47 1.294
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.293 2015/11/07 23:41:58 joerg Exp $
+# $NetBSD: bsd.prog.mk,v 1.294 2016/01/23 21:22:47 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -330,6 +330,7 @@
.endif
.if defined(RUMPPRG)
+CPPFLAGS+= -D_KERNTYPES
PROG= ${RUMPPRG}
. ifndef CRUNCHEDPROG
. if (${MKRUMP} != "no")
--- src/sys/arch/i386/stand/boot/Makefile.boot 2015/08/20 11:39:28 1.67
+++ src/sys/arch/i386/stand/boot/Makefile.boot 2016/01/23 21:22:47 1.68
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.67 2015/08/20 11:39:28 uebayasi Exp $
+# $NetBSD: Makefile.boot,v 1.68 2016/01/23 21:22:47 christos Exp $
S= ${.CURDIR}/../../../../..
@@ -36,7 +36,7 @@
LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,boot_start
CPPFLAGS+= -I ${.CURDIR}/.. -I ${.CURDIR}/../../lib -I ${S}/lib/libsa
-CPPFLAGS+= -I ${.OBJDIR}
+CPPFLAGS+= -I ${.OBJDIR} -D_KERNTYPES
# Make sure we override any optimization options specified by the user
COPTS= -Os
--- src/sys/arch/i386/stand/dosboot/Makefile 2014/01/15 22:25:22 1.28
+++ src/sys/arch/i386/stand/dosboot/Makefile 2016/01/23 21:22:47 1.29
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/01/15 22:25:22 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2016/01/23 21:22:47 christos Exp $
S= ${.CURDIR}/../../../..
@@ -13,7 +13,7 @@
CPPFLAGS+= -DSLOW # for libz
CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
-CPPFLAGS+= -DXMS
+CPPFLAGS+= -DXMS -D_KERNTYPES
CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
#uncomment if there are problems with memory detection
#CPPFLAGS+= -DCONSERVATIVE_MEMDETECT
--- src/sys/arch/i386/stand/pxeboot/Makefile 2014/01/15 22:25:22 1.22
+++ src/sys/arch/i386/stand/pxeboot/Makefile 2016/01/23 21:22:47 1.23
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/01/15 22:25:22 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2016/01/23 21:22:47 christos Exp $
S= ${.CURDIR}/../../../..
@@ -40,7 +40,7 @@
CPPFLAGS+= -DCONSPEED=boot_params.bp_conspeed
CPPFLAGS+= -DCONSADDR=boot_params.bp_consaddr
CPPFLAGS+= -DCONSOLE_KEYMAP=boot_params.bp_keymap
-CPPFLAGS+= -DDIRECT_SERIAL
+CPPFLAGS+= -DDIRECT_SERIAL -D_KERNTYPES
# Various serial line configurations
#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
# or
--- src/tests/dev/Makefile.inc 2010/11/03 16:10:19 1.1
+++ src/tests/dev/Makefile.inc 2016/01/23 21:22:48 1.2
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFlAGS+=-D_KERNTYPES
--- src/tests/dev/audio/Makefile 2012/12/02 18:39:53 1.4
+++ src/tests/dev/audio/Makefile 2016/01/23 21:22:48 1.5
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/12/02 18:39:53 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -13,6 +13,7 @@
PROGS= h_pad
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpdev_pad -lrumpdev_audio -lrumpdev -lrumpvfs
LDADD+= -lrump
LDADD+= -lrumpuser
--- src/tests/dev/dm/Makefile 2012/12/02 18:39:53 1.2
+++ src/tests/dev/dm/Makefile 2016/01/23 21:22:48 1.3
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2012/12/02 18:39:53 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -14,6 +14,7 @@
PROGS= h_dm
+CPPFLAGS+=-D_KERNTYPES
LDADD+= -lprop -lutil
LDADD+= -lrumpdev_disk -lrumpdev_dm
LDADD+= -lrumpdev -lrumpvfs
--- src/tests/dev/md/Makefile 2015/01/07 22:24:03 1.5
+++ src/tests/dev/md/Makefile 2016/01/23 21:22:48 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/01/07 22:24:03 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -13,6 +13,7 @@
PROGS= h_mdserv
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev -lrumpvfs
LDADD+= -lrumpkern_sysproxy -lrump
LDADD+= -lrumpuser
--- src/tests/dev/scsipi/Makefile 2014/06/10 04:28:39 1.6
+++ src/tests/dev/scsipi/Makefile 2016/01/23 21:22:48 1.7
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
TESTS_C= t_cd
-CPPFLAGS+= -I${.CURDIR}/libscsitest
+CPPFLAGS+= -I${.CURDIR}/libscsitest -D_KERNTYPES
# kernel component required by test
SUBDIR= libscsitest
--- src/tests/dev/sysmon/Makefile 2014/06/10 04:28:39 1.3
+++ src/tests/dev/sysmon/Makefile 2016/01/23 21:22:48 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -7,6 +7,7 @@
TESTS_C= t_swwdog
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs
LDADD+= -lrump
LDADD+= -lrumpuser
--- src/tests/fs/Makefile.inc 2010/11/03 16:10:20 1.1
+++ src/tests/fs/Makefile.inc 2016/01/23 21:22:48 1.2
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFLAGS+= -D_KERNTYPES
.include "../Makefile.inc"
--- src/tests/fs/puffs/h_dtfs/Makefile 2010/07/13 21:13:23 1.4
+++ src/tests/fs/puffs/h_dtfs/Makefile 2016/01/23 21:22:48 1.5
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2010/07/13 21:13:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2016/01/23 21:22:48 christos Exp $
TESTSDIR= ${TESTSBASE}/fs/puffs/h_dtfs
ATFFILE= no
TESTS_C= h_dtfs
+CPPFLAGS+= -D_KERNTYPES
SRCS.h_dtfs= dtfs.c dtfs_vfsops.c dtfs_vnops.c dtfs_subr.c
LDADD+= -lpuffs -lutil
--- src/tests/include/sys/Makefile 2015/06/22 00:05:23 1.8
+++ src/tests/include/sys/Makefile 2016/01/23 21:22:48 1.9
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/22 00:05:23 matt Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:48 christos Exp $
NOMAN= # defined
@@ -12,6 +12,7 @@
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_C+= t_socket
+CPPFLAGS.t_socket.c+= -D_KERNTYPES
LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet
LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread
.endif
--- src/tests/kernel/Makefile 2015/06/22 00:05:23 1.37
+++ src/tests/kernel/Makefile 2016/01/23 21:22:48 1.38
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/06/22 00:05:23 matt Exp $
+# $NetBSD: Makefile,v 1.38 2016/01/23 21:22:48 christos Exp $
NOMAN= # defined
@@ -38,6 +38,7 @@
LDADD.t_filedesc+= ${LDADD.t_rnd}
LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser
LDADD.t_rnd+= -lrump -lpthread
+CPPFLAGS+= -D_KERNTYPES
.endif
--- src/tests/kernel/tty/Makefile 2014/06/10 04:28:39 1.2
+++ src/tests/kernel/tty/Makefile 2016/01/23 21:22:49 1.3
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:49 christos Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@
TESTS_C= t_pr
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpkern_tty -lrumpvfs -lrump -lrumpuser
LDADD+= -lrump
LDADD+= -lpthread
--- src/tests/lib/libc/sys/Makefile 2015/06/22 00:05:23 1.39
+++ src/tests/lib/libc/sys/Makefile 2016/01/23 21:22:49 1.40
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2015/06/22 00:05:23 matt Exp $
+# $NetBSD: Makefile,v 1.40 2016/01/23 21:22:49 christos Exp $
MKMAN= no
@@ -72,6 +72,7 @@
LDADD.t_getpid+= -lpthread
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
+CPPFLAGS.t_posix_fadvise.c += -D_KERNTYPES
TESTS_C+= t_posix_fadvise
LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
.endif
--- src/tests/lib/librumpclient/Makefile 2012/12/02 17:36:10 1.5
+++ src/tests/lib/librumpclient/Makefile 2016/01/23 21:22:49 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/12/02 17:36:10 pgoyette Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:49 christos Exp $
#
.include <bsd.own.mk>
@@ -14,6 +14,7 @@
PROGS+= h_exec
PROGS+= h_execthr
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpclient
LDADD.h_execthr= -lpthread
--- src/tests/lib/semaphore/pthread/Makefile 2014/06/10 04:28:39 1.3
+++ src/tests/lib/semaphore/pthread/Makefile 2016/01/23 21:22:49 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:49 christos Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
TESTS_C= t_sem_pth
-CPPFLAGS+= -I${.CURDIR}/..
+CPPFLAGS+= -I${.CURDIR}/.. -D_KERNTYPES
LDADD+= -lrump -lrumpuser -lrump -lpthread
--- src/tests/modules/Makefile 2014/06/10 04:28:40 1.11
+++ src/tests/modules/Makefile 2016/01/23 21:22:49 1.12
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2014/06/10 04:28:40 he Exp $
+# $NetBSD: Makefile,v 1.12 2016/01/23 21:22:49 christos Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/modules
+CPPFLAGS+= -D_KERNTYPES
# Ideally this test could be in the parent Makefile, which could not descend
# into this directory at all. Unfortunately, the etc/mtree/NetBSD.dist file
--- src/tests/modules/Makefile.inc 2010/11/03 16:10:23 1.1
+++ src/tests/modules/Makefile.inc 2016/01/23 21:22:49 1.2
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFLAGS+= -D_KERNTYPES
--- src/tests/net/Makefile.inc 2010/11/03 16:10:24 1.1
+++ src/tests/net/Makefile.inc 2016/01/23 21:22:49 1.2
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFLAGS+=-D_KERNTYPES
--- src/tests/rump/Makefile.inc 2010/11/03 16:10:25 1.1
+++ src/tests/rump/Makefile.inc 2016/01/23 21:22:49 1.2
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFLAGS+= -D_KERNTYPES
--- src/usr.bin/kdump/Makefile 2015/09/26 03:31:11 1.31
+++ src/usr.bin/kdump/Makefile 2016/01/23 21:22:49 1.32
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/09/26 03:31:11 christos Exp $
+# $NetBSD: Makefile,v 1.32 2016/01/23 21:22:49 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR
@@ -17,7 +17,7 @@
.include "Makefile.ioctl-c"
.include "Makefile.siginfo-c"
-CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys -D_KERNTYPES
LDADD+=-lutil
DPADD+=${LIBUTIL}
--- src/usr.bin/ktruss/Makefile 2015/09/26 13:31:27 1.29
+++ src/usr.bin/ktruss/Makefile 2016/01/23 21:22:49 1.30
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/09/26 13:31:27 christos Exp $
+# $NetBSD: Makefile,v 1.30 2016/01/23 21:22:49 christos Exp $
NOMAN= # defined
@@ -30,7 +30,7 @@
.include "${NETBSDSRCDIR}/usr.bin/kdump/Makefile.ioctl-c"
CPPFLAGS+= -I. -I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys \
- -I${NETBSDSRCDIR}/usr.bin/kdump -DKTRUSS
+ -I${NETBSDSRCDIR}/usr.bin/kdump -DKTRUSS -D_KERNTYPES
.include <bsd.prog.mk>
--- src/usr.bin/ldd/Makefile.inc 2015/06/13 20:38:52 1.6
+++ src/usr.bin/ldd/Makefile.inc 2016/01/23 21:22:49 1.7
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2015/06/13 20:38:52 martin Exp $
+# $NetBSD: Makefile.inc,v 1.7 2016/01/23 21:22:49 christos Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
@@ -22,6 +22,7 @@
COMPAT_MLIBDIR= o32
CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32
.endif
+CPPFLAGS+= -D_KERNTYPES
.endif # MKCOMPAT
--- src/usr.bin/pmap/Makefile 2015/12/14 03:15:10 1.6
+++ src/usr.bin/pmap/Makefile 2016/01/23 21:22:49 1.7
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/12/14 03:15:10 christos Exp $
+# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:49 christos Exp $
USE_FORT?= yes # setgid
PROG= pmap
@@ -9,5 +9,6 @@
DPADD= ${LIBUTIL} ${LIBKVM}
CWARNFLAGS.clang+= -Wno-format-extra-args
+CPPFLAGS+= -D_KMEMUSER
.include <bsd.prog.mk>
--- src/usr.bin/rump_allserver/Makefile 2013/11/13 17:47:27 1.7
+++ src/usr.bin/rump_allserver/Makefile 2016/01/23 21:22:49 1.8
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2013/11/13 17:47:27 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:49 christos Exp $
#
PROG= rump_allserver
MLINKS+=rump_allserver.1 rump_server.1
RUMPTOP=${.CURDIR}/../../sys/rump
+CPPFLAGS+= -D_KERNTYPES
.include "${RUMPTOP}/dev/Makefile.rumpdevcomp"
.include "${RUMPTOP}/fs/Makefile.rumpfscomp"
--- src/usr.bin/rump_dhcpclient/Makefile 2011/01/20 18:47:19 1.1
+++ src/usr.bin/rump_dhcpclient/Makefile 2016/01/23 21:22:50 1.2
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2011/01/20 18:47:19 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:50 christos Exp $
#
PROG= rump.dhcpclient
SRCS= main.c bpf.c common.c configure.c dhcp.c if-bsd.c net.c
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpclient
--- src/usr.bin/rump_halt/Makefile 2010/12/12 12:48:31 1.1
+++ src/usr.bin/rump_halt/Makefile 2016/01/23 21:22:50 1.2
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/12/12 12:48:31 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:50 christos Exp $
#
PROG= rump.halt
LDADD+= -lrumpclient
DPADD+= ${RUMPCLIENT}
+CPPFLAGS+= -D_KERNTYPES
.include <bsd.prog.mk>
--- src/usr.bin/rump_server/Makefile 2015/01/07 22:24:03 1.8
+++ src/usr.bin/rump_server/Makefile 2016/01/23 21:22:50 1.9
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/01/07 22:24:03 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:50 christos Exp $
#
.PATH: ${.CURDIR}/../rump_allserver
@@ -7,6 +7,7 @@
SRCS= rump_allserver.c
NOMAN= installed by ../rump_allserver
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump \
-lrumpuser -Wl,--no-whole-archive -lpthread
--- src/usr.bin/systat/Makefile 2012/01/06 14:08:08 1.37
+++ src/usr.bin/systat/Makefile 2016/01/23 21:22:50 1.38
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/01/06 14:08:08 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2016/01/23 21:22:50 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -9,7 +9,7 @@
.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat ${NETBSDSRCDIR}/usr.bin/who
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat -DSUPPORT_UTMP -DSUPPORT_UTMPX \
- -I${NETBSDSRCDIR}/usr.bin/who
+ -I${NETBSDSRCDIR}/usr.bin/who -D_KMEMUSER
CWARNFLAGS+= -Wno-format-y2k
SRCS= bufcache.c cmds.c cmdtab.c disks.c df.c drvstats.c fetch.c \
globalcmds.c icmp.c iostat.c ip.c keyboard.c main.c mbufs.c \
--- src/usr.sbin/Makefile.inc 2009/04/22 15:23:01 1.6
+++ src/usr.sbin/Makefile.inc 2016/01/23 21:22:50 1.7
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.6 2009/04/22 15:23:01 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.7 2016/01/23 21:22:50 christos Exp $
# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93
BINDIR?= /usr/sbin
WARNS?= 4
+CPPFLAGS+= -D_KERNTYPES
--- src/usr.sbin/acpitools/acpidump/Makefile 2009/12/27 21:42:22 1.5
+++ src/usr.sbin/acpitools/acpidump/Makefile 2016/01/23 21:22:50 1.6
--- src/usr.sbin/acpitools/amldb/Makefile 2009/02/14 13:56:41 1.3
+++ src/usr.sbin/acpitools/amldb/Makefile 2016/01/23 21:22:50 1.4
--- src/usr.sbin/cpuctl/Makefile 2013/08/01 23:19:39 1.7
+++ src/usr.sbin/cpuctl/Makefile 2016/01/23 21:22:50 1.8
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/08/01 23:19:39 matt Exp $
+# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:50 christos Exp $
.include <bsd.own.mk>
@@ -19,6 +19,7 @@
SRCS+= ${MACHINE_ARCH}-asm.S
.endif
+CPPFLAGS+= -D_KERNTYPES
LDADD+=-lutil
DPADD+=${LIBUTIL}
--- src/usr.sbin/perfused/Makefile 2012/09/06 16:39:08 1.5
+++ src/usr.sbin/perfused/Makefile 2016/01/23 21:22:50 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/09/06 16:39:08 riz Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:50 christos Exp $
PROG= perfused
@@ -9,6 +9,7 @@
MAN= perfused.8
WARNS= 4
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lperfuse -lpuffs
DPADD+= ${LIBPUFFS}
--- src/usr.sbin/puffs/Makefile.inc 2014/01/16 01:15:34 1.14
+++ src/usr.sbin/puffs/Makefile.inc 2016/01/23 21:22:50 1.15
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2014/01/16 01:15:34 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2016/01/23 21:22:50 christos Exp $
WARNS?= 4
@@ -19,6 +19,7 @@
MOUNT= ${MOUNTDIR}/mount
CPPFLAGS+= -I${MOUNTDIR}/mount_${MOUNTNAME} -I${MOUNT} -DMOUNT_NOMAIN
+CPPFLAGS+= -D_KERNTYPES
SRCS+= mount_${MOUNTNAME}.c rump_${MOUNTNAME}.c pathadj.c fattr.c
# on select archs use the kernel module directly, otherwise fallback