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/bunzip2.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/bunzip2.c')
| -rw-r--r-- | libXfont/src/fontfile/bunzip2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXfont/src/fontfile/bunzip2.c b/libXfont/src/fontfile/bunzip2.c index 9964de6e9..d8b9321e1 100644 --- a/libXfont/src/fontfile/bunzip2.c +++ b/libXfont/src/fontfile/bunzip2.c @@ -54,7 +54,7 @@ BufFilePushBZIP2 (BufFilePtr f) { xzip_buf *x; - x = (xzip_buf *) xalloc (sizeof (xzip_buf)); + x = malloc (sizeof (xzip_buf)); if (!x) return NULL; bzero(&(x->z), sizeof(bz_stream)); @@ -64,7 +64,7 @@ BufFilePushBZIP2 (BufFilePtr f) 0, /* verbosity: 0 silent, 4 max */ 0); /* 0: go faster, 1: use less memory */ if (x->zstat != BZ_OK) { - xfree(x); + free(x); return NULL; } @@ -87,7 +87,7 @@ BufBzip2FileClose(BufFilePtr f, int flag) xzip_buf *x = (xzip_buf *)f->private; BZ2_bzDecompressEnd (&(x->z)); BufFileClose (x->f, flag); - xfree (x); + free (x); return 1; } |