Date: Mon, 21 Jul 2008 04:57:18 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 145534 for review Message-ID: <200807210457.m6L4vIBg041042@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145534 Change 145534 by jb@freebsd3 on 2008/07/21 04:56:23 The ZFS hacks in the compatibility does bite into the usability of the FreeBSD headers for other things. We don't seem to make much choice but to add knobs to tweak what the headers whack. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile.inc#10 edit .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/types.h#3 edit .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/uio.h#3 edit .. //depot/projects/dtrace/src/sys/modules/zfs/Makefile#8 edit .. //depot/projects/dtrace/src/usr.bin/fstat/zfs/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile.inc#10 (text+ko) ==== @@ -4,3 +4,5 @@ OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris IGNORE_PRAGMA= YES + +CFLAGS+= -DNEED_SOLARIS_BOOLEAN ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/types.h#3 (text+ko) ==== @@ -64,12 +64,13 @@ typedef int64_t rlim64_t; #else - +#ifdef NEED_SOLARIS_BOOLEAN #if defined(__XOPEN_OR_POSIX) typedef enum { _B_FALSE, _B_TRUE } boolean_t; #else typedef enum { B_FALSE, B_TRUE } boolean_t; #endif /* defined(__XOPEN_OR_POSIX) */ +#endif typedef longlong_t offset_t; typedef u_longlong_t u_offset_t; ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/uio.h#3 (text+ko) ==== @@ -51,6 +51,7 @@ #define uio_loffset uio_offset +#ifdef BUILDING_ZFS static __inline int zfs_uiomove(void *cp, size_t n, enum uio_rw dir, uio_t *uio) { @@ -59,5 +60,6 @@ return (uiomove(cp, (int)n, uio)); } #define uiomove(cp, n, dir, uio) zfs_uiomove((cp), (n), (dir), (uio)) +#endif #endif /* !_OPENSOLARIS_SYS_UIO_H_ */ ==== //depot/projects/dtrace/src/sys/modules/zfs/Makefile#8 (text+ko) ==== @@ -78,6 +78,7 @@ CFLAGS+=-I${SUNW}/common/zfs CFLAGS+=-I${SUNW}/common CFLAGS+=-I${.CURDIR}/../../../include +CFLAGS+=-DBUILDING_ZFS #CFLAGS+=-DDEBUG=1 #DEBUG_FLAGS=-g ==== //depot/projects/dtrace/src/usr.bin/fstat/zfs/Makefile#5 (text+ko) ==== @@ -15,6 +15,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/.. +CFLAGS+= -DNEED_SOLARIS_BOOLEAN all: ${OBJS} CLEANFILES= ${OBJS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807210457.m6L4vIBg041042>