diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
| commit | ddfb922180a6a847d52609592a2bdb37179ca439 (patch) | |
| tree | 7cc662bfb9ffb45c4c4452ea373e3c1a843b395a /libXfont/src/fontfile/renderers.c | |
| parent | 02934f83dd4f5848083e2e5cdbc6ef7f60361f06 (diff) | |
| parent | 2fb179f86b0f9ecb7876759b87f9c64634a3f114 (diff) | |
| download | vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.gz vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.bz2 vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Gives currently link errors. xorg-server needs to be upgraded to.
Diffstat (limited to 'libXfont/src/fontfile/renderers.c')
| -rw-r--r-- | libXfont/src/fontfile/renderers.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libXfont/src/fontfile/renderers.c b/libXfont/src/fontfile/renderers.c index f110ba817..f75faea0a 100644 --- a/libXfont/src/fontfile/renderers.c +++ b/libXfont/src/fontfile/renderers.c @@ -1,5 +1,3 @@ -/* $Xorg: renderers.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -35,6 +33,7 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include <X11/fonts/fntfilst.h> +#include <unistd.h> extern void ErrorF(const char *f, ...); static FontRenderersRec renderers; @@ -62,13 +61,13 @@ FontFilePriorityRegisterRenderer (FontRendererPtr renderer, int priority) rendererGeneration = serverGeneration; renderers.number = 0; if (renderers.renderers) - xfree(renderers.renderers); + free(renderers.renderers); renderers.renderers = NULL; } for (i = 0; i < renderers.number; i++) { - if (!strcmp (renderers.renderers[i].renderer->fileSuffix, - renderer->fileSuffix)) { + if (!strcasecmp (renderers.renderers[i].renderer->fileSuffix, + renderer->fileSuffix)) { if(renderers.renderers[i].priority >= priority) { if(renderers.renderers[i].priority == priority) { if (rendererGeneration == 1) @@ -84,7 +83,7 @@ FontFilePriorityRegisterRenderer (FontRendererPtr renderer, int priority) } if(i >= renderers.number) { - new = xrealloc (renderers.renderers, sizeof(*new) * (i + 1)); + new = realloc (renderers.renderers, sizeof(*new) * (i + 1)); if (!new) return FALSE; renderers.renderers = new; @@ -108,7 +107,7 @@ FontFileMatchRenderer (char *fileName) { r = renderers.renderers[i].renderer; if (fileLen >= r->fileSuffixLen && - !strcmp (fileName + fileLen - r->fileSuffixLen, r->fileSuffix)) + !strcasecmp (fileName + fileLen - r->fileSuffixLen, r->fileSuffix)) { return r; } |