diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:39 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:39 +0000 |
commit | d7b40bfbde99825269c97a12af4897d9b5ef9be2 (patch) | |
tree | 564785607517c63f64f4eb098fc7c91690469bd6 /src/xftfreetype.c | |
parent | 52a3d6a04aa1a18223059334f8d5ed2955461b7d (diff) | |
download | xorg-lib-libXft-d7b40bfbde99825269c97a12af4897d9b5ef9be2.tar.gz |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
Diffstat (limited to 'src/xftfreetype.c')
-rw-r--r-- | src/xftfreetype.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xftfreetype.c b/src/xftfreetype.c index 1d3a473..6fce545 100644 --- a/src/xftfreetype.c +++ b/src/xftfreetype.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.29 2002/10/11 17:53:02 keithp Exp $ + * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.30 2003/03/26 20:43:51 tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -51,7 +51,7 @@ _XftGetFile (const FcChar8 *file, int id) for (f = _XftFtFiles; f; f = f->next) { - if (!strcmp (f->file, (void *) file) && f->id == id) + if (!strcmp (f->file, (char *) file) && f->id == id) { ++f->ref; if (XftDebug () & XFT_DBG_REF) @@ -74,7 +74,7 @@ _XftGetFile (const FcChar8 *file, int id) f->ref = 1; f->file = (char *) (f+1); - strcpy (f->file, (void *) file); + strcpy (f->file, (char *) file); f->id = id; f->lock = 0; |