hide block_t behind _MINIX (for gcc)

diff --git a/include/sys/types.h b/include/sys/types.h
index 9dcf4fd9db5628ad645c610bbe5e0b4beb24dca0..4e645f4e419ad6a6e1feef5b45adefe30801b4ac 100644 (file)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -114,12 +114,14 @@ typedef u32_t             big_nlink_t;
 typedef u32_t          big_uid_t;
 
 
+#ifdef _MINIX
 /* some Minix specific types that do not conflict with posix */
 typedef u32_t zone_t;      /* zone number */
 typedef u32_t block_t;     /* block number */
 typedef u32_t bit_t;       /* bit number in a bit map */
 typedef u16_t zone1_t;     /* zone number for V1 file systems */
 typedef u32_t bitchunk_t; /* collection of bits in a bitmap */
+#endif
 
 /* ANSI C makes writing down the promotion of unsigned types very messy.  When
  * sizeof(short) == sizeof(int), there is no promotion, so the type stays

diff --git a/kernel/Makefile b/kernel/Makefile
index d385c26d4acf5c6e3a199ea69aa25d8bc66926f7..26fef605e205fac98248bb3e31b9c75982aef764 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -15,7 +15,7 @@ LDADD+=       -ltimers -lsys -lexec
 
 CFLAGS += -D__kernel__ 
 
-CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE
+CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE -D_MINIX
 LDFLAGS+= -T $(LINKERSCRIPT)
 LDFLAGS+= -nostdlib -L${DESTDIR}/${LIBDIR}
 LDADD+= -lminlib

diff --git a/sys/arch/i386/stand/boot/biosboot/Makefile b/sys/arch/i386/stand/boot/biosboot/Makefile
index 2d3c9988863fb717d990c8a683556f0b14c61ba1..7d697f33199058802316aee649767ec55be102fd 100644 (file)
--- a/sys/arch/i386/stand/boot/biosboot/Makefile
+++ b/sys/arch/i386/stand/boot/biosboot/Makefile
@@ -3,4 +3,6 @@
 PROG=  boot_monitor
 CLEANFILES= lib
 
+CPPFLAGS+= -D_MINIX
+
 .include <../Makefile.boot>

diff --git a/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile b/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
index 6110228d963e16925cf8af7cc6e4e156ecb8b24d..2a6418aa3ee68b679abb279db3d95d4000ca8e4d 100644 (file)
--- a/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
+++ b/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
@@ -2,5 +2,6 @@
 
 FS=ext2fs
 CLEANFILES= lib
+CPPFLAGS+= -D_MINIX
 
 .include <../Makefile.bootxx>

diff --git a/usr.sbin/mkfs.mfs/Makefile b/usr.sbin/mkfs.mfs/Makefile
index 169888e6b81a5c86a8a3d0b036d1604bc9415738..c9a462e83ecb24bb4e9e7048fed7037bd0329a3c 100644 (file)
--- a/usr.sbin/mkfs.mfs/Makefile
+++ b/usr.sbin/mkfs.mfs/Makefile
@@ -3,6 +3,8 @@ SRCS=   mkfs.c
 BINDIR=        /sbin
 MAN=
 
+CPPFLAGS+= -D_MINIX
+
 LDADD?= -lminlib -lcompat_minix
 
 .include <bsd.prog.mk>