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;
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to