From owner-p4-projects@FreeBSD.ORG  Wed Jul 17 21:35:05 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 9CAE7A93; Wed, 17 Jul 2013 21:35:05 +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 507E4A91
 for <perforce@freebsd.org>; Wed, 17 Jul 2013 21:35:05 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 41D29CB6
 for <perforce@freebsd.org>; Wed, 17 Jul 2013 21:35:05 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HLZ59n098213
 for <perforce@freebsd.org>; Wed, 17 Jul 2013 21:35:05 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6HLZ52Y098210
 for perforce@freebsd.org; Wed, 17 Jul 2013 21:35:05 GMT
 (envelope-from jonathan@freebsd.org)
Date: Wed, 17 Jul 2013 21:35:05 GMT
Message-Id: <201307172135.r6HLZ52Y098210@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 231232 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: Wed, 17 Jul 2013 21:35:05 -0000

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

Change 231232 by jonathan@jonathan-on-joe on 2013/07/17 21:34:55

	Sync latest TESLA parts from GitHub (commit 829723).

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#4 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#4 (text+ko) ====

@@ -62,11 +62,9 @@
  *  * a counter to ensure uniqueness (__COUNTER__)
  *  * the TESLA context (per-thread or global)
  */
-inline void
+void
 __tesla_inline_assertion(const char *filename, int line, int count,
-	__tesla_locality *loc, ...)
-{
-}
+	__tesla_locality *loc, ...);
 
 
 /* Only define the following things if doing TESLA analysis, not compiling. */
@@ -135,6 +133,9 @@
 struct __tesla_event* __tesla_optional(__tesla_event*, ...);
 
 /** A value that could match a lot of function parameters. Maybe anything? */
+#ifdef __OBJC__
+id		__tesla_any_id();
+#endif
 void*		__tesla_any_ptr();
 int		__tesla_any_int();
 long		__tesla_any_long();