sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hide block_t behind _MINIX (for gcc)

Browse source
This commit is contained in:
Ben Gras 2012-08-24 17:54:07 +02:00
parent 201031fb38
commit 41ab295654
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sys/types.h
View file

@ -114,12 +114,14 @@ typedef u32_t big_nlink_t;
typedef u32_t big_uid_t; typedef u32_t big_uid_t;
#ifdef _MINIX
/* some Minix specific types that do not conflict with posix */ /* some Minix specific types that do not conflict with posix */
typedef u32_t zone_t; /* zone number */ typedef u32_t zone_t; /* zone number */
typedef u32_t block_t; /* block number */ typedef u32_t block_t; /* block number */
typedef u32_t bit_t; /* bit number in a bit map */ typedef u32_t bit_t; /* bit number in a bit map */
typedef u16_t zone1_t; /* zone number for V1 file systems */ typedef u16_t zone1_t; /* zone number for V1 file systems */
typedef u32_t bitchunk_t; /* collection of bits in a bitmap */ 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 /* 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 * sizeof(short) == sizeof(int), there is no promotion, so the type stays

2
kernel/Makefile
View file

@ -15,7 +15,7 @@ LDADD+= -ltimers -lsys -lexec
CFLAGS += -D__kernel__ CFLAGS += -D__kernel__
CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE -D_MINIX
LDFLAGS+= -T $(LINKERSCRIPT) LDFLAGS+= -T $(LINKERSCRIPT)
LDFLAGS+= -nostdlib -L${DESTDIR}/${LIBDIR} LDFLAGS+= -nostdlib -L${DESTDIR}/${LIBDIR}
LDADD+= -lminlib LDADD+= -lminlib

2
sys/arch/i386/stand/boot/biosboot/Makefile
View file

@ -3,4 +3,6 @@
PROG= boot_monitor PROG= boot_monitor
CLEANFILES= lib CLEANFILES= lib
CPPFLAGS+= -D_MINIX
.include <../Makefile.boot> .include <../Makefile.boot>

1
sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
View file

@ -2,5 +2,6 @@
FS=ext2fs FS=ext2fs
CLEANFILES= lib CLEANFILES= lib
CPPFLAGS+= -D_MINIX
.include <../Makefile.bootxx> .include <../Makefile.bootxx>

2
usr.sbin/mkfs.mfs/Makefile
View file

@ -3,6 +3,8 @@ SRCS= mkfs.c
BINDIR= /sbin BINDIR= /sbin
MAN= MAN=
CPPFLAGS+= -D_MINIX
LDADD?= -lminlib -lcompat_minix LDADD?= -lminlib -lcompat_minix
.include <bsd.prog.mk> .include <bsd.prog.mk>