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

[Jon TURNEY]

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

-------------- next part --------------
>From b91fec8dfb62a29cfc1809e77965ace16bd814d8 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Mon, 31 Dec 2012 18:17:31 +0000
Subject: [PATCH] Fix compilation with --with-arch since 83d80190
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 83d80190 "Fix unused-parameter warnings" breaks compilation of fcarch.c
when --with-arch is used.

/jhbuild/checkout/fontconfig/src/fcarch.c:69:16: error: expected â??;â??, â??,â?? or â??)â??
before â??FC_UNUSEDâ??

fcint.h, which is now always required for the definition of FC_UNUSED, is not
included when FC_ARCHITECTURE is defined.

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 src/fcarch.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fcarch.c b/src/fcarch.c
index 8e6a8c4..1294d0f 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -27,16 +27,16 @@
 #include <config.h>
 #endif
 
+#include "fcint.h"
+
+#include "fcarch.h"
+
 /* If architecture is hardcoded, skip the assert tests */
 
 #ifndef FC_ARCHITECTURE
 
 /* Make sure the cache structure is consistent with what we expect */
 
-#include "fcint.h"
-
-#include "fcarch.h"
-
 FC_ASSERT_STATIC (1 == sizeof (char));
 FC_ASSERT_STATIC (2 == sizeof (FcChar16));
 FC_ASSERT_STATIC (4 == sizeof (int));
-- 
1.7.9