diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-15 16:28:11 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-15 16:28:11 +0000 |
| commit | c38dead3ea7e177728d90cd815cf4eead0c9f534 (patch) | |
| tree | b809dba1dc9013bb1e67a5ee388f2dd217dc0f88 /xorg-server/glx/xfont.c | |
| parent | 6083a94d68878c9ad5f59b28bd07e4738e9fb7b4 (diff) | |
| download | vcxsrv-c38dead3ea7e177728d90cd815cf4eead0c9f534.tar.gz vcxsrv-c38dead3ea7e177728d90cd815cf4eead0c9f534.tar.bz2 vcxsrv-c38dead3ea7e177728d90cd815cf4eead0c9f534.zip | |
xserver git update 15/5/2010
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 9bd432a80..abcad1240 100644 --- a/xorg-server/glx/xfont.c +++ b/xorg-server/glx/xfont.c @@ -46,8 +46,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
*/
@@ -76,7 +74,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;
@@ -100,7 +98,7 @@ static int __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci) allocbuf ? allocbuf : buf) );
if (allocbuf) {
- xfree(allocbuf);
+ free(allocbuf);
}
return Success;
#undef __GL_CHAR_BUF_SIZE
|