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/util/private.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/util/private.c')
| -rw-r--r-- | libXfont/src/util/private.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libXfont/src/util/private.c b/libXfont/src/util/private.c index 85e90e57b..6b760b4c3 100644 --- a/libXfont/src/util/private.c +++ b/libXfont/src/util/private.c @@ -53,7 +53,7 @@ CreateFontRec (void) size = sizeof(FontRec) + (sizeof(pointer) * _FontPrivateAllocateIndex); - pFont = (FontPtr)xalloc(size); + pFont = malloc(size); if(pFont) { bzero((char*)pFont, size); @@ -69,8 +69,8 @@ void DestroyFontRec (FontPtr pFont) { if (pFont->devPrivates && pFont->devPrivates != (pointer)(&pFont[1])) - xfree(pFont->devPrivates); - xfree(pFont); + free(pFont->devPrivates); + free(pFont); } void @@ -86,11 +86,12 @@ _FontSetNewPrivate (FontPtr pFont, int n, pointer ptr) if (n > pFont->maxPrivate) { if (pFont->devPrivates && pFont->devPrivates != (pointer)(&pFont[1])) { - new = (pointer *) xrealloc (pFont->devPrivates, (n + 1) * sizeof (pointer)); + new = realloc (pFont->devPrivates, (n + 1) * sizeof (pointer)); if (!new) return FALSE; } else { - new = (pointer *) xalloc ((n + 1) * sizeof (pointer)); + /* omg realloc */ + new = malloc ((n + 1) * sizeof (pointer)); if (!new) return FALSE; if (pFont->devPrivates) |