Pacify gcc 3.2

This commit is contained in:
Marc Aurele La France 2002-09-18 17:11:46 +00:00
parent 05336fd8be
commit d1bec8c66d
3 changed files with 6 additions and 5 deletions

View File

@ -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. * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -24,6 +24,7 @@
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

View File

@ -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. * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -246,7 +246,7 @@ FcListValueHash (FcValue v)
case FcTypeCharSet: case FcTypeCharSet:
return FcCharSetCount (v.u.c); return FcCharSetCount (v.u.c);
case FcTypeFTFace: case FcTypeFTFace:
return (FcChar32) v.u.f; return (long) v.u.f;
case FcTypeLangSet: case FcTypeLangSet:
return FcLangSetHash (v.u.l); return FcLangSetHash (v.u.l);
} }

View File

@ -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. * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -395,7 +395,7 @@ FcPatternBaseHash (FcPattern *b)
int i; int i;
for (i = 0; i < b->num; 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; return hash;
} }