head/bin/sh/output.h r215303

jhell jhell at DataIX.net
Mon Nov 15 05:01:25 UTC 2010


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


More information about the freebsd-current mailing list