Merge with HEAD and finish the GCC 4 cleanups (no more warnings!)

[fontconfig.git] / fontconfig / fcprivate.h

diff --git a/fontconfig/fcprivate.h b/fontconfig/fcprivate.h
index 8f8d36735b9e3e7859cbf058a4bc6699a9581f1b..9be4c0188db1612cc4dedbca60b0f75ba892819c 100644 (file)
--- a/fontconfig/fcprivate.h
+++ b/fontconfig/fcprivate.h
@@ -59,7 +59,7 @@
            __v__.u.d = va_arg (va, double);                        \
            break;                                                  \
        case FcTypeString:                                          \
-           __v__.u.s = va_arg (va, const char *);                  \
+           __v__.u.s = va_arg (va, const FcChar8 *);               \
            break;                                                  \
        case FcTypeBool:                                            \
            __v__.u.b = va_arg (va, FcBool);                        \