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/bufio.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/bufio.c')
| -rw-r--r-- | libXfont/src/fontfile/bufio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libXfont/src/fontfile/bufio.c b/libXfont/src/fontfile/bufio.c index a5746e3bd..dd8d6e282 100644 --- a/libXfont/src/fontfile/bufio.c +++ b/libXfont/src/fontfile/bufio.c @@ -51,7 +51,7 @@ BufFileCreate (char *private, { BufFilePtr f; - f = (BufFilePtr) xalloc (sizeof *f); + f = malloc (sizeof *f); if (!f) return 0; f->private = private; @@ -125,7 +125,7 @@ BufFileRawClose (BufFilePtr f, int doClose) BufFilePtr BufFileOpenRead (int fd) { -#if defined(__UNIXOS2__) || defined (WIN32) +#if defined (WIN32) /* hv: I'd bet WIN32 has the same effect here */ setmode(fd,O_BINARY); #endif @@ -160,7 +160,7 @@ BufFileOpenWrite (int fd) { BufFilePtr f; -#if defined(__UNIXOS2__) || defined(WIN32) +#if defined(WIN32) /* hv: I'd bet WIN32 has the same effect here */ setmode(fd,O_BINARY); #endif @@ -201,6 +201,6 @@ BufFileClose (BufFilePtr f, int doClose) { int ret; ret = (*f->close) (f, doClose); - xfree (f); + free (f); return ret; } |