From owner-p4-projects@FreeBSD.ORG  Tue Jul 23 00:41:03 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E445559E; Tue, 23 Jul 2013 00:41:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A60B459C
 for <perforce@freebsd.org>; Tue, 23 Jul 2013 00:41:02 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 962DB2CD6
 for <perforce@freebsd.org>; Tue, 23 Jul 2013 00:41:02 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6N0f2vM009453
 for <perforce@freebsd.org>; Tue, 23 Jul 2013 00:41:02 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6N0f2ps009450
 for perforce@freebsd.org; Tue, 23 Jul 2013 00:41:02 GMT
 (envelope-from jonathan@freebsd.org)
Date: Tue, 23 Jul 2013 00:41:02 GMT
Message-Id: <201307230041.r6N0f2ps009450@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 231359 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jul 2013 00:41:03 -0000

http://p4web.freebsd.org/@@231359?ac=10

Change 231359 by jonathan@jonathan-on-zenith on 2013/07/23 00:40:35

	Move \#define assert() to above the place where, as of libtesla optimisations, it is now used.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#11 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#11 (text+ko) ====

@@ -70,6 +70,11 @@
 /** Is @a x a subset of @a y? */
 #define	SUBSET(x,y) ((x & y) == x)
 
+#ifdef _KERNEL
+/** Emulate simple POSIX assertions. */
+#define assert(cond) KASSERT((cond), ("Assertion failed: '%s'", #cond))
+#endif
+
 /**
  * Call this if things go catastrophically, unrecoverably wrong.
  */
@@ -194,9 +199,6 @@
 /** Our @ref tesla_assert has the same signature as @ref KASSERT. */
 #define tesla_assert(...) KASSERT(__VA_ARGS__)
 
-/** Emulate simple POSIX assertions. */
-#define assert(cond) KASSERT((cond), ("Assertion failed: '%s'", #cond))
-
 #define tesla_malloc(len) malloc(len, M_TESLA, M_WAITOK | M_ZERO)
 #define tesla_free(x) free(x, M_TESLA)