Re: Head not buildin in zfs.c

On 2015-01-21 11:08, Garrett Cooper wrote:
> On Jan 21, 2015, at 2:05, Willem Jan Withagen <wjw_at_digiware.nl> wrote:
>
>> On 2015-01-21 10:51, Benjamin Perrault wrote:
>>>
>>>> On Jan 21, 2015, at 1:34 AM, Willem Jan Withagen <wjw_at_digiware.nl>
>>>> wrote:
>>>>
>>>>
>>>> Found this lastnight build. Just fetched the most recent HEAD.
>>>> Error remains
>>>>
>>>> --- zfs/zfs.o --- In file included from
>>>> /usr/srcs/src11/src/lib/libprocstat/zfs/../zfs.c:39:
>>>> /usr/srcs/src11/src/lib/libprocstat/zfs/../../../cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:538:9:
>>>> error: 'NSEC_TO_TICK' macro redefined [-Werror,-Wmacro-redefined]
>>>> #define NSEC_TO_TICK(usec)      ((usec) / (NANOSEC / hz)) ^
>>>> /usr/srcs/src11/src/lib/libprocstat/zfs/../../../sys/cddl/compat/opensolaris/sys/time.h:54:9:
>>>> note: previous definition is here #define NSEC_TO_TICK(nsec)
>>>> ((nsec) / (NANOSEC / hz)) ^ /etc/{make,src}.conf are empty
>>>>
>>
>>> I’m seeing the exact same issue. It began for me at r277472 and is
>>> still persisting as of r277482 ( the most recent HEAD as of writing
>>> this email ).
>>
>> Well, the problem is reported several times during compilation.
>> This is the first warning that also has -Werror, and hence building stops.
>>
>> I have not been able to find where this -Werror "all of a sudden" pops up.
>>
>> Has to be in any of those commits...
>
> 	It’s a mismatch in the macro definitions, made in the commit below.
> I’m testing out a fix for it right now.
> Thanks for the report!
>
> ------------------------------------------------------------------------
> r277449 | will | 2015-01-20 14:29:27 -0800 (Tue, 20 Jan 2015) | 2 lines
>
> NSEC_TO_TICK(usec) -> NSEC_TO_TICK(nsec)
>

Right, picky nasty compilers being fussy. ;)

I did in look in the svn log of both .h files, but overlooked what you 
just found..... Need more coffee.

I'll be waiting the the fix in the tree..

Thanx,
--WjW