Date: Mon, 22 Oct 2012 06:35:27 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 218783 for review Message-ID: <201210220635.q9M6ZRXp082220@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@218783?ac=10 Change 218783 by jhb@jhb_ralph on 2012/10/20 03:28:49 Mismerge. Affected files ... .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/debug.h#3 edit Differences ... ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/debug.h#3 (text+ko) ==== @@ -23,26 +23,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/debug.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/debug.h,v 1.4 2012/09/12 18:05:43 mm Exp $ */ #ifndef _OPENSOLARIS_SYS_DEBUG_H_ #define _OPENSOLARIS_SYS_DEBUG_H_ #ifdef _KERNEL -#include <sys/types.h> #include <sys/systm.h> #include_next <sys/debug.h> - -#define assfail(a, f, l) \ - (panic("solaris assert: %s, file: %s, line: %d", (a), (f), (l)), 0) +#else /* !_KERNEL */ -#define assfail3(a, lv, op, rv, f, l) \ - panic("solaris assert: %s (0x%jx %s 0x%jx), file: %s, line: %d", \ - (a), (uintmax_t)(lv), (op), (uintmax_t)(rv), (f), (l)) -#else /* !_KERNEL */ #include_next <sys/debug.h> -#endif +#include <sys/assfail.h> +#endif /* _KERNEL */ #endif /* _OPENSOLARIS_SYS_DEBUG_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210220635.q9M6ZRXp082220>