From: Marc Aurele La France <tsi@ualberta.edu>
Date: Wed, 18 Sep 2002 17:11:46 +0000 (+0000)
Subject: Pacify gcc 3.2
X-Git-Tag: ah-20021030~9
X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=commitdiff_plain;h=d1bec8c66d729fe67992a0212b3dffa18879e88f

Pacify gcc 3.2
---

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 00cf7fd..c7485aa 100644
--- 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 6c04a1a..39d1729 100644
--- 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 28abe55..964e7c7 100644
--- 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;
 }