From owner-p4-projects@FreeBSD.ORG  Wed May  7 02:55:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C477610656AD; Wed,  7 May 2008 02:55:26 +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 8516A10656A9
	for <perforce@freebsd.org>; Wed,  7 May 2008 02:55:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 364178FC18
	for <perforce@freebsd.org>; Wed,  7 May 2008 02:55:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m472tQxL061017
	for <perforce@freebsd.org>; Wed, 7 May 2008 02:55:26 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m472tQEn061015
	for perforce@freebsd.org; Wed, 7 May 2008 02:55:26 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 7 May 2008 02:55:26 GMT
Message-Id: <200805070255.m472tQEn061015@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141263 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 07 May 2008 02:55:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=141263

Change 141263 by sam@sam_ebb on 2008/05/07 02:54:39

	fix merge botch

Affected files ...

.. //depot/projects/vap/lib/libc/stdio/Symbol.map#5 edit

Differences ...

==== //depot/projects/vap/lib/libc/stdio/Symbol.map#5 (text) ====

@@ -149,9 +149,3 @@
 	__printf_arginfo_vis;
 	__printf_render_vis;
 };
-
-FBSDprivate_1.1 {
-	__fgetcookie;
-	__fgetpendout;
-	__fsetfileno;
-};