diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-08 23:42:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-08 23:46:56 +0200 |
| commit | d0f70707dde032e662dbd5bc70df6ac915403abe (patch) | |
| tree | 19a595625f8cdedc3662a8638f65451208103dfd /libXfont/src/fontfile/renderers.c | |
| parent | cb346e228aeb500cd61ec86644c034c238332d3b (diff) | |
| download | vcxsrv-d0f70707dde032e662dbd5bc70df6ac915403abe.tar.gz vcxsrv-d0f70707dde032e662dbd5bc70df6ac915403abe.tar.bz2 vcxsrv-d0f70707dde032e662dbd5bc70df6ac915403abe.zip | |
Updated to libXfont 1.5.0
Diffstat (limited to 'libXfont/src/fontfile/renderers.c')
| -rw-r--r-- | libXfont/src/fontfile/renderers.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libXfont/src/fontfile/renderers.c b/libXfont/src/fontfile/renderers.c index a9e4bef53..bbcd46694 100644 --- a/libXfont/src/fontfile/renderers.c +++ b/libXfont/src/fontfile/renderers.c @@ -40,7 +40,7 @@ static FontRenderersRec renderers; * XXX Maybe should allow unregistering renders. For now, just clear the * list at each new generation. */ -extern unsigned long serverGeneration; +extern unsigned long __GetServerGeneration(void); static unsigned long rendererGeneration = 0; Bool @@ -55,8 +55,8 @@ FontFilePriorityRegisterRenderer (FontRendererPtr renderer, int priority) int i; struct _FontRenderersElement *new; - if (rendererGeneration != serverGeneration) { - rendererGeneration = serverGeneration; + if (rendererGeneration != __GetServerGeneration()) { + rendererGeneration = __GetServerGeneration(); renderers.number = 0; if (renderers.renderers) free(renderers.renderers); @@ -64,7 +64,7 @@ FontFilePriorityRegisterRenderer (FontRendererPtr renderer, int priority) } for (i = 0; i < renderers.number; i++) { - if (!strcasecmp (renderers.renderers[i].renderer->fileSuffix, + if (!strcasecmp (renderers.renderers[i].renderer->fileSuffix, renderer->fileSuffix)) { if(renderers.renderers[i].priority >= priority) { if(renderers.renderers[i].priority == priority) { @@ -99,7 +99,7 @@ FontFileMatchRenderer (char *fileName) int i; int fileLen; FontRendererPtr r; - + fileLen = strlen (fileName); for (i = 0; i < renderers.number; i++) { |