From owner-freebsd-current@FreeBSD.ORG Mon Nov 15 05:01:25 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0709B106566B for ; Mon, 15 Nov 2010 05:01:25 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id AE3678FC20 for ; Mon, 15 Nov 2010 05:01:24 +0000 (UTC) Received: by gxk9 with SMTP id 9so2908807gxk.13 for ; Sun, 14 Nov 2010 21:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :organization:user-agent:mime-version:to:cc:subject:references :in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=jAK89TGg8aVTr3T2amwxBRhdg8x2aGejmkFdPvDtdaI=; b=JD6LPBDEzHuy6gfPXuqwgr53pwdN2amMXc1oX9/FJoaJo3D/xVzMlvC571hykvZUOk x2EqZwsUWCE7rRSL31tVfzRcyHOjCoAvaZ5Q0PP+yEfW+QvQf6aOtHQ68Q4LxJeNzEky mexzFQmGAn2faG0FKuB/gCrmF/s7Er7CFU35g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:organization:user-agent:mime-version:to :cc:subject:references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=FQpaQrxjvvWGH/Dp0MTmIdIAAw5t0E0nGAWMDKZp8pXY7d2PG5e8GhVwPOqoSKv8hF CKxdy/BVKxz3lT1y78vqCgpb2xg5ymyr3mPSmVrd2JO47lf6/KUggFqq2F8oirXvuob5 y2mCmMV2MK42ly0BCG6hagCdpqk69s+hYNI94= Received: by 10.151.9.8 with SMTP id m8mr8814084ybi.213.1289797283877; Sun, 14 Nov 2010 21:01:23 -0800 (PST) Received: from centel.dataix.local ([99.181.158.26]) by mx.google.com with ESMTPS id q41sm2827192ybk.13.2010.11.14.21.01.20 (version=SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 21:01:22 -0800 (PST) Sender: "J. Hellenthal" Message-ID: <4CE0BE9F.7050203@DataIX.net> Date: Mon, 15 Nov 2010 00:01:19 -0500 From: jhell Organization: http://www.DataIX.net User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.2.12) Gecko/20101028 Lightning/1.0b1 Thunderbird MIME-Version: 1.0 To: Jilles Tjoelker References: <4CE0101D.4020600@DataIX.net> <20101114194626.GB1831@stack.nl> In-Reply-To: <20101114194626.GB1831@stack.nl> X-Enigmail-Version: 1.1.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: FreeBSD Current Subject: Re: head/bin/sh/output.h r215303 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Nov 2010 05:01:25 -0000 On 11/14/2010 14:46, Jilles Tjoelker wrote: > On Sun, Nov 14, 2010 at 11:36:45AM -0500, jhell wrote: >> I just merged some of the changes to stable/8 of bin/sh, specifically >> all the recent changes that happened. In revision 215303 it shows that >> you added stddef.h as an include to output.h while jobs.c includes both >> output.h and stddef.h resulting in 'offsetof' being redefined. > > This problem was introduced by r213775 include changes, which you have > merged yourself. I had already noticed this myself in head and fixed it > in r213925. > > I have now MFCed r213775 and r213925 so your problem should be solved. > Ugh! thanks Still not quite clear on how a full merge of the changes in head to what is in stable would have missed that, so I guess Ill just have to look into that. -- jhell,v