diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
| commit | 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f (patch) | |
| tree | cfe0c736c95314edac7d9f1065be9c13026ed0c1 /xorg-server/glx/xfont.c | |
| parent | 6b29aa4559aeb6f795caee047561654bfa0a1954 (diff) | |
| download | vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.gz vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.bz2 vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.zip | |
svn merge -r588:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/glx/xfont.c')
| -rw-r--r-- | xorg-server/glx/xfont.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c index a2573d4dd..af0b21831 100644 --- a/xorg-server/glx/xfont.c +++ b/xorg-server/glx/xfont.c @@ -50,8 +50,6 @@ #include <windowstr.h>
#include <dixfontstr.h>
-extern XID clientErrorValue; /* imported kludge from dix layer */
-
/*
** Make a single GL bitmap from a single X glyph
*/
@@ -80,7 +78,7 @@ static int __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci) p = buf;
allocbuf = 0;
} else {
- p = (unsigned char *) xalloc(allocBytes);
+ p = (unsigned char *) malloc(allocBytes);
if (!p)
return BadAlloc;
allocbuf = p;
@@ -104,7 +102,7 @@ static int __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci) allocbuf ? allocbuf : buf) );
if (allocbuf) {
- xfree(allocbuf);
+ free(allocbuf);
}
return Success;
#undef __GL_CHAR_BUF_SIZE
|