From owner-cvs-src@FreeBSD.ORG  Wed Feb  1 15:10:12 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6D6DC16A420;
	Wed,  1 Feb 2006 15:10:12 +0000 (GMT)
	(envelope-from stefan@fafoe.narf.at)
Received: from viefep17-int.chello.at (viefep17-int.chello.at [213.46.255.23])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1F7DD43D48;
	Wed,  1 Feb 2006 15:10:10 +0000 (GMT)
	(envelope-from stefan@fafoe.narf.at)
Received: from wombat.fafoe.narf.at ([213.47.85.26]) by viefep17-int.chello.at
	(InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id
	<20060201151008.PSFT6330.viefep17-int.chello.at@wombat.fafoe.narf.at>;
	Wed, 1 Feb 2006 16:10:08 +0100
Received: by wombat.fafoe.narf.at (Postfix, from userid 1001)
	id 108B2BFB4; Wed,  1 Feb 2006 16:10:08 +0100 (CET)
Date: Wed, 1 Feb 2006 16:10:08 +0100
From: Stefan Farfeleder <stefanf@FreeBSD.org>
To: Kris Kennaway <kris@obsecurity.org>
Message-ID: <20060201151002.GC610@wombat.fafoe.narf.at>
References: <200602011224.k11COeeV055370@repoman.freebsd.org>
	<20060201150021.GA26651@xor.obsecurity.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060201150021.GA26651@xor.obsecurity.org>
User-Agent: Mutt/1.5.11
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/include nl_types.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Feb 2006 15:10:12 -0000

On Wed, Feb 01, 2006 at 10:00:21AM -0500, Kris Kennaway wrote:
> On Wed, Feb 01, 2006 at 12:24:39PM +0000, Stefan Farfeleder wrote:
> > stefanf     2006-02-01 12:24:39 UTC
> > 
> >   FreeBSD src repository
> > 
> >   Modified files:        (Branch: RELENG_6)
> >     include              nl_types.h 
> >   Log:
> >   Unbreak building RELENG_6 on RELENG_5 by providing a __format_arg macro if
> >   it's not defined in <sys/cdefs.h>.  This situation happens early when building
> >   the bootstrap-tools, where the new <nl_types.h> is mixed with the old
> >   <sys/cdefs.h>.
> >   
> >   Submitted by:   imp
> >   Reviewed by:    ru
> 
> So just to check, you now cannot update to RELENG_6 from 5.4-RELEASE?

RELENG_5 was never touched, so there's no difference between 5.4-RELEASE
and RELENG_5.  Building RELENG_6 on 5.x (I think this applies to 6.0
too) worked with nl_types.h 1.11, did not with 1.11.2.1 and now works
again with 1.11.2.2.

Stefan