From owner-svn-src-projects@FreeBSD.ORG  Thu Sep 20 14:52:51 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 82BC91065670;
	Thu, 20 Sep 2012 14:52:51 +0000 (UTC)
	(envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6DE748FC12;
	Thu, 20 Sep 2012 14:52:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8KEqplJ038202;
	Thu, 20 Sep 2012 14:52:51 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8KEqp9b038200;
	Thu, 20 Sep 2012 14:52:51 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201209201452.q8KEqp9b038200@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Thu, 20 Sep 2012 14:52:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240747 - projects/amd64_xen_pv/sys/dev/xen/netback
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Sep 2012 14:52:51 -0000

Author: cherry
Date: Thu Sep 20 14:52:50 2012
New Revision: 240747
URL: http://svn.freebsd.org/changeset/base/240747

Log:
  Alter file scoped macro semantics to fit usecases, in order to fix
  build on llvm.
  
  An alternate fix would have been an inline private function instead,
  but given that there are no consumers of the return value of the
  expression - Occam's Razor was applied.
  
  Reported by Bret Ketchum <Bret_Ketchum@DELL.com>.

Modified:
  projects/amd64_xen_pv/sys/dev/xen/netback/netback_unit_tests.c

Modified: projects/amd64_xen_pv/sys/dev/xen/netback/netback_unit_tests.c
==============================================================================
--- projects/amd64_xen_pv/sys/dev/xen/netback/netback_unit_tests.c	Thu Sep 20 14:38:21 2012	(r240746)
+++ projects/amd64_xen_pv/sys/dev/xen/netback/netback_unit_tests.c	Thu Sep 20 14:52:50 2012	(r240747)
@@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$");
 #define	TOSTRING(x) STRINGIFY(x)
 
 /**
- * Writes an error message to buffer if cond is false, and returns true
- * iff the assertion failed.  Note the implied parameters buffer and
+ * Writes an error message to buffer if cond is false
+ * Note the implied parameters buffer and
  * buflen
  */
 #define	XNB_ASSERT(cond) ({						\
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 		strlcat(_buffer, ":" TOSTRING(__LINE__) 		\
 		  " Assertion Error: " #cond "\n", _buflen);		\
 	}								\
- ! passed; })
+        })
 
 
 /**