diff --git a/render/glyph.c b/render/glyph.c index de0197083..849e65fce 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -92,14 +92,6 @@ static GlyphHashRec globalGlyphs[GlyphFormatNum]; static void FreeGlyphPrivates (GlyphPtr glyph) { - ScreenPtr pScreen; - int i; - - for (i = 0; i < screenInfo.numScreens; i++) { - pScreen = screenInfo.screens[i]; - dixFreePrivates(*GetGlyphPrivatesForScreen(glyph, pScreen)); - } - dixFreePrivates(glyph->devPrivates); glyph->devPrivates = NULL; } diff --git a/render/picturestr.h b/render/picturestr.h index acd15c7fe..1ce16be7d 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -403,9 +403,6 @@ extern RESTYPE GlyphSetType; #define GetPictureWindow(w) ((PicturePtr)dixLookupPrivate(&(w)->devPrivates, PictureWindowPrivateKey)) #define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, PictureWindowPrivateKey, p) -#define GetGlyphPrivatesForScreen(glyph, s) \ - ((PrivateRec **)dixLookupPrivateAddr(&(glyph)->devPrivates, s)) - #define VERIFY_PICTURE(pPicture, pid, client, mode, err) {\ pPicture = SecurityLookupIDByType(client, pid, PictureType, mode);\ if (!pPicture) { \