diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-06 18:48:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-06 18:48:27 +0000 |
| commit | a915739887477b28d924ecc8417ee107d125bd6c (patch) | |
| tree | c02f315476b61892d1fd89182e18943dce8d6277 /xorg-server/hw/dmx/dmxfont.c | |
| parent | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff) | |
| download | vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.gz vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.bz2 vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.zip | |
Switched to xorg-server-1.6.99.900.tar.gz
Diffstat (limited to 'xorg-server/hw/dmx/dmxfont.c')
| -rw-r--r-- | xorg-server/hw/dmx/dmxfont.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xorg-server/hw/dmx/dmxfont.c b/xorg-server/hw/dmx/dmxfont.c index c739159a8..c33aee79a 100644 --- a/xorg-server/hw/dmx/dmxfont.c +++ b/xorg-server/hw/dmx/dmxfont.c @@ -49,12 +49,6 @@ #include "dixfont.h" #include "dixstruct.h" -#undef Xmalloc -#undef Xcalloc -#undef Xrealloc -#undef Xfree - - static int (*dmxSaveProcVector[256])(ClientPtr); static int dmxFontLastError; @@ -259,7 +253,7 @@ Bool dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont) { DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum]; dmxFontPrivPtr pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex); - char *name; + const char *name; char **oldFontPath = NULL; int nOldPaths; Atom name_atom, value_atom; @@ -421,7 +415,7 @@ Bool dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont) } if (!value_atom) return FALSE; - name = (char *)NameForAtom(value_atom); + name = NameForAtom(value_atom); if (!name) return FALSE; pFontPriv->font[pScreen->myNum] = |