svn commit: r223139 - head/lib/libstand

Garrett Cooper yanegomi at gmail.com
Thu Jun 16 07:22:21 UTC 2011


On Thu, Jun 16, 2011 at 12:19 AM, Garrett Cooper <yanegomi at gmail.com> wrote:
> On Thu, Jun 16, 2011 at 12:14 AM, Tai-hwa Liang <avatar at freebsd.org> wrote:
>> Author: avatar
>> Date: Thu Jun 16 07:14:55 2011
>> New Revision: 223139
>> URL: http://svn.freebsd.org/changeset/base/223139
>>
>> Log:
>>  Unbreaking build on sparc64.
>>
>>  Submitted by: Garrett Cooper <yanegomi at gmail.com>
>>
>> Modified:
>>  head/lib/libstand/zalloc.c
>>
>> Modified: head/lib/libstand/zalloc.c
>> ==============================================================================
>> --- head/lib/libstand/zalloc.c  Thu Jun 16 05:26:03 2011        (r223138)
>> +++ head/lib/libstand/zalloc.c  Thu Jun 16 07:14:55 2011        (r223139)
>> @@ -154,7 +154,7 @@ zfree(MemPool *mp, void *ptr, iaddr_t by
>>     if ((char *)ptr < (char *)mp->mp_Base ||
>>        (char *)ptr + bytes > (char *)mp->mp_End ||
>>        ((iaddr_t)ptr & MEMNODE_SIZE_MASK) != 0)
>> -       panic("zfree(%p,%d): wild pointer", ptr, bytes);
>> +       panic("zfree(%p,%ju): wild pointer", ptr, bytes);
>
> All of those need to be cast to (uintmax_t). Sorry :(..

And you need to add #include <stdint.h> to stand.h in order to get
uintmax_t. Here's a proper patch for amd64..

Let me run this through make universe first though..

Thanks,
-Garrett
-------------- next part --------------
A non-text attachment was scrubbed...
Name: unbreak-libstand-zalloc-compile-take2.patch
Type: text/x-patch
Size: 1491 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-head/attachments/20110616/a1610a57/unbreak-libstand-zalloc-compile-take2.bin


More information about the svn-src-head mailing list