Date: Tue, 18 Sep 2012 08:00:56 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r240631 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys Message-ID: <201209180800.q8I80uJ5053337@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Tue Sep 18 08:00:56 2012 New Revision: 240631 URL: http://svn.freebsd.org/changeset/base/240631 Log: zfs: allow both DEBUG and ZFS_DEBUG to be defined on command line Discussed with: pjd MFC after: 10 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h Tue Sep 18 08:00:43 2012 (r240630) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h Tue Sep 18 08:00:56 2012 (r240631) @@ -43,8 +43,10 @@ extern "C" { */ #if defined(DEBUG) || !defined(_KERNEL) +#if !defined(ZFS_DEBUG) #define ZFS_DEBUG #endif +#endif extern int zfs_flags;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209180800.q8I80uJ5053337>