From owner-p4-projects@FreeBSD.ORG  Sun Jul 11 04:50:13 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A12F71065672; Sun, 11 Jul 2010 04:50:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5ECA1106566B
	for <perforce@FreeBSD.org>; Sun, 11 Jul 2010 04:50:13 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4CFEC8FC08
	for <perforce@FreeBSD.org>; Sun, 11 Jul 2010 04:50:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6B4oCvP077319
	for <perforce@FreeBSD.org>; Sun, 11 Jul 2010 04:50:12 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6B4oCR7077317
	for perforce@freebsd.org; Sun, 11 Jul 2010 04:50:12 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sun, 11 Jul 2010 04:50:12 GMT
Message-Id: <201007110450.o6B4oCR7077317@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 180747 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sun, 11 Jul 2010 04:50:13 -0000

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

Change 180747 by gonzo@gonzo_figaro on 2010/07/11 04:49:33

	merge fix from HEAD for buildworld breakage

Affected files ...

.. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 edit

Differences ...

==== //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 (text+ko) ====

@@ -67,8 +67,12 @@
  * for all subsequent invocations, which is the effect desired.
  */
 #undef  unput
-#define unput(c) \
-	if (c != EOF) yyunput( c, yytext_ptr )
+#define unput(c)					\
+	do {						\
+		int _c = c;				\
+		if (_c != EOF)				\
+			yyunput(_c, yytext_ptr);	\
+	} while(0)
 #endif
 
 static int id_or_type(const char *);