From owner-p4-projects@FreeBSD.ORG  Sat Jun  8 17:09:21 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E4DFD2A0; Sat,  8 Jun 2013 17:09:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A57D529E
 for <perforce@freebsd.org>; Sat,  8 Jun 2013 17:09:20 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 950A7171B
 for <perforce@freebsd.org>; Sat,  8 Jun 2013 17:09:20 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r58H9KMk046658
 for <perforce@freebsd.org>; Sat, 8 Jun 2013 17:09:20 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r58H9KlK046655
 for perforce@freebsd.org; Sat, 8 Jun 2013 17:09:20 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 8 Jun 2013 17:09:20 GMT
Message-Id: <201306081709.r58H9KlK046655@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 229509 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: Sat, 08 Jun 2013 17:09:21 -0000

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

Change 229509 by rwatson@rwatson_cinnamon on 2013/06/08 17:08:51

	tesla-macros.h is intended to be promiscuous with C namespaces,
	but "done" is a bit too promiscuous, as it conflicts with many
	"done" labels in the FreeBSD kernel source.  Rename to "tdone"
	for now, but actually "tesla_done" would be better.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#2 edit

Differences ...

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

@@ -82,7 +82,7 @@
 
 #define automaton(name, ...)    __tesla_automaton(name, __VA_ARGS__)
 
-#define	done return (__tesla_automaton_done())
+#define	tdone return (__tesla_automaton_done())
 
 #define	optional(...)	__tesla_optional(__tesla_ignore, __VA_ARGS__)
 #define	ANY_REP	INT_MAX