From 66400b6a1006fb0fe8ad5366b1586b7c080d461c Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Mon, 12 Nov 2012 22:28:32 +0000
Subject: [PATCH] Redo r242889, now using the method from projects/amd64_xen_pv
 r240747.

Reminded by:	kib
MFC after:	3 days
---
 sys/dev/xen/netback/netback_unit_tests.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/dev/xen/netback/netback_unit_tests.c b/sys/dev/xen/netback/netback_unit_tests.c
index 2e0d3f8d3bc0..92e2b68eefc6 100644
--- a/sys/dev/xen/netback/netback_unit_tests.c
+++ b/sys/dev/xen/netback/netback_unit_tests.c
@@ -58,11 +58,11 @@ __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) do {						\
+#define	XNB_ASSERT(cond) ({						\
 	int passed = (cond);						\
 	char *_buffer = (buffer);					\
 	size_t _buflen = (buflen);					\
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 		strlcat(_buffer, ":" TOSTRING(__LINE__) 		\
 		  " Assertion Error: " #cond "\n", _buflen);		\
 	}								\
-	} while (0)
+	})
 
 
 /**