Date: Mon, 15 Nov 2010 00:01:19 -0500 From: jhell <jhell@DataIX.net> To: Jilles Tjoelker <jilles@stack.nl> Cc: FreeBSD Current <current@freebsd.org> Subject: Re: head/bin/sh/output.h r215303 Message-ID: <4CE0BE9F.7050203@DataIX.net> In-Reply-To: <20101114194626.GB1831@stack.nl> References: <4CE0101D.4020600@DataIX.net> <20101114194626.GB1831@stack.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4CE0BE9F.7050203>