Pacify gcc 3.2

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 00cf7fde4fb77004b4349ed0e98867a3153d66ab..c7485aad320c080e5c5e39785634cfbbf8a7f6e0 100644 (file)
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.7 2002/08/11 15:09:33 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -24,6 +24,7 @@
 
 #include <fontconfig/fontconfig.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/fclist.c b/src/fclist.c
index 6c04a1ad124e70e48885d6a5b947db3525ed76be..39d17292f89fb54ce0a2c2c724be4491efd2bcc4 100644 (file)
--- a/src/fclist.c
+++ b/src/fclist.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fclist.c,v 1.10 2002/08/22 07:36:44 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fclist.c,v 1.11tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -246,7 +246,7 @@ FcListValueHash (FcValue    v)
     case FcTypeCharSet:
        return FcCharSetCount (v.u.c);
     case FcTypeFTFace:
-       return (FcChar32) v.u.f;
+       return (long) v.u.f;
     case FcTypeLangSet:
        return FcLangSetHash (v.u.l);
     }

diff --git a/src/fcpat.c b/src/fcpat.c
index 28abe556cec9d95192ad6f185b1ffa6ed98f04a2..964e7c7fb658e13a50875c9cdfd82a0f49596b98 100644 (file)
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fcpat.c,v 1.16tsi Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcpat.c,v 1.17tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -395,7 +395,7 @@ FcPatternBaseHash (FcPattern *b)
     int                i;
 
     for (i = 0; i < b->num; i++)
-       hash = ((hash << 1) | (hash >> 31)) ^ ((FcChar32) b->elts[i].values);
+       hash = ((hash << 1) | (hash >> 31)) ^ ((long) b->elts[i].values);
     return hash;
 }