From owner-freebsd-current@FreeBSD.ORG Sun Nov 14 19:46:29 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 6311F1065670 for ; Sun, 14 Nov 2010 19:46:29 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from mx1.stack.nl (relay04.stack.nl [IPv6:2001:610:1108:5010::107]) by mx1.freebsd.org (Postfix) with ESMTP id F27058FC08 for ; Sun, 14 Nov 2010 19:46:28 +0000 (UTC) Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132]) by mx1.stack.nl (Postfix) with ESMTP id 23F081DD649; Sun, 14 Nov 2010 20:46:27 +0100 (CET) Received: by turtle.stack.nl (Postfix, from userid 1677) id 0A9B31735C; Sun, 14 Nov 2010 20:46:27 +0100 (CET) Date: Sun, 14 Nov 2010 20:46:26 +0100 From: Jilles Tjoelker To: jhell Message-ID: <20101114194626.GB1831@stack.nl> References: <4CE0101D.4020600@DataIX.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4CE0101D.4020600@DataIX.net> User-Agent: Mutt/1.5.21 (2010-09-15) 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: Sun, 14 Nov 2010 19:46:29 -0000 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. -- Jilles Tjoelker