From owner-freebsd-current@FreeBSD.ORG  Sun Nov 14 17:05:10 2010
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 3498D106564A;
	Sun, 14 Nov 2010 17:05:10 +0000 (UTC)
	(envelope-from jhellenthal@gmail.com)
Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54])
	by mx1.freebsd.org (Postfix) with ESMTP id CA18C8FC08;
	Sun, 14 Nov 2010 17:05:09 +0000 (UTC)
Received: by gwj20 with SMTP id 20so2310146gwj.13
	for <multiple recipients>; Sun, 14 Nov 2010 09:05:09 -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:subject:x-enigmail-version
	:content-type:content-transfer-encoding;
	bh=iSnXMueL4TheEPrIU1ByWMaZyf1s7/OLa6YxKrA/qlI=;
	b=K6EWDaoVb6v4UK6eVOvNVIyvofYMfma0FxsYU5lF6H2gOwxTmAG5OYM4LUBU1fkVvY
	sCdQ+8mn70Ra2Oxjw9X9XoRBFWNUZbemPCFWM/JCT1wsnhTwZT1BU3JqXg+iE/78xQ0e
	7exHaf1Nwm0/3WEKhTXSaJM7RXGT179XCoHJs=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=sender:message-id:date:from:organization:user-agent:mime-version:to
	:subject:x-enigmail-version:content-type:content-transfer-encoding;
	b=UhAOMDdU6AcO1Sc+Rvb3P2RNoGxB9g5PYaC7oLwIVxAkpxgK/1RxAuoIlGP+4dm7fo
	0n0Fz1E5OKgKhKzMXME6NPMZ844yiR6OraMq0Fd9mOoy4gD51Zd7+S0tZjKVa24hZaYk
	LwExD5N47fqZ8YJpohCQiZ/XZXDmWX1LB+HOo=
Received: by 10.151.83.16 with SMTP id k16mr7898651ybl.239.1289752608430;
	Sun, 14 Nov 2010 08:36:48 -0800 (PST)
Received: from centel.dataix.local
	(adsl-99-181-158-26.dsl.klmzmi.sbcglobal.net [99.181.158.26])
	by mx.google.com with ESMTPS id q8sm2250881ybk.12.2010.11.14.08.36.46
	(version=SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 08:36:47 -0800 (PST)
Sender: "J. Hellenthal" <jhellenthal@gmail.com>
Message-ID: <4CE0101D.4020600@DataIX.net>
Date: Sun, 14 Nov 2010 11:36:45 -0500
From: jhell <jhell@DataIX.net>
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 <jilles@freebsd.org>, 
	FreeBSD Current <current@freebsd.org>
X-Enigmail-Version: 1.1.2
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: 
Subject: 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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Nov 2010 17:05:10 -0000

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


Hey Jilles,

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 fixes the problem,

diff -r e16f819581a1 bin/sh/jobs.c
- --- a/bin/sh/jobs.c     Sun Nov 14 11:07:41 2010 -0500
+++ b/bin/sh/jobs.c     Sun Nov 14 11:35:11 2010 -0500
@@ -41,7 +41,6 @@
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/resource.h>
- -#include <sys/stddef.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <errno.h>

- -- 

 jhell,v
-----BEGIN PGP SIGNATURE-----

iQEcBAEBAgAGBQJM4BAdAAoJEJBXh4mJ2FR+2soH/1wsPWvw8fM2mzlYcfch51LA
nOC7CLxDw1tirMmH/TeVmG1vZt0l1HbW15c3wuxgjLt1ubDiAGiR4FRFj0LIz4FS
xtnHlpT4HednVBxRflqhPr1KoJWNoM94r3GF93DwHpYsMTpThtWoV1RpnPW9ZrNs
+IaooRECQazDnb5ctQq64ysrzTTmqw9khRRS8ovGTjOQCNaHA1/68rTVpj6Kykne
OqlVHFRnxqdaC/+yxocyWpAk4T4zPzTz4H7kTdiWcGhphjuhJPtTFweJPQpD4VV/
QkNecRocgYp0fDB3wjhCqu4QN2AF48AveKtbAYlFKC92//8ShXDGdTOCID3CeLs=
=63/p
-----END PGP SIGNATURE-----