[Fontconfig] fontconfig: Branch 'master' - 7 commits

[Behdad Esfahbod]

On 12-12-31 12:29 PM, Jon TURNEY wrote:
> On 30/12/2012 03:58, Behdad Esfahbod wrote:
>> commit 83d8019011232d491df93cda97a2f988ee96005b
>> Author: Behdad Esfahbod <behdad at behdad.org>
>> Date:   Sat Dec 29 22:32:56 2012 -0500
>>
>>     Fix unused-parameter warnings
>>
>> diff --git a/src/fcarch.c b/src/fcarch.c
>> index 44548fc..8e6a8c4 100644
>> --- a/src/fcarch.c
>> +++ b/src/fcarch.c
>> @@ -66,7 +66,7 @@ FC_ASSERT_STATIC (0x08 + 6*SIZEOF_VOID_P == sizeof (FcCache));
>>  
>>  
>>  int
>> -main (int argc, char **argv)
>> +main (int argc FC_UNUSED, char **argv FC_UNUSED)
>>  {
>>      printf ("%s\n", FC_ARCHITECTURE);
>>      return 0;
>> diff --git a/src/fccache.c b/src/fccache.c
> 
> This seems to break compilation when --with-arch is used, see [1].  Attached
> is a small patch to fix.
> 
> [1] http://tinderbox.freedesktop.org/builds/2012-12-30-0013/logs/fontconfig/#build

Thanks.  Fixed.  BTW, any reason that jbhuild defines FC_ARCHITECTURE
manually?  It shouldn't be needed these days.

-- 
behdad
http://behdad.org/