Fix more gcc4 warnings:

[fontconfig.git] / src / fcdefault.c

diff --git a/src/fcdefault.c b/src/fcdefault.c
index 0e84311faa6f0f59bdeeb7fd7f31c9f5a044e130..5e648dc94e84fdf23482499dc7728f57c2bfe326 100644 (file)
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -26,7 +26,7 @@
 #include <locale.h>
 
 static struct {
-    char       *field;
+    const char *field;
     FcBool     value;
 } FcBoolDefaults[] = {
     { FC_HINTING,          FcTrue      },  /* !FT_LOAD_NO_HINTING */
@@ -35,7 +35,7 @@ static struct {
     { FC_GLOBAL_ADVANCE,    FcTrue     },  /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */
 };
 
-#define NUM_FC_BOOL_DEFAULTS   (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0])
+#define NUM_FC_BOOL_DEFAULTS   (int) (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0])
 
 void
 FcDefaultSubstitute (FcPattern *pattern)
@@ -127,7 +127,7 @@ FcDefaultSubstitute (FcPattern *pattern)
                        after = territory + strlen (territory);
                }
                territory_len = after - territory;
-               if (lang_len + 1 + territory_len + 1 <= sizeof (lang_local))
+               if (lang_len + 1 + territory_len + 1 <= (int) sizeof (lang_local))
                {
                    strncpy (lang_local, lang, lang_len);
                    lang_local[lang_len] = '-';