Merge branch 'master' into XACE-SELINUX

This commit is contained in:
Eamon Walsh
2007-03-07 09:03:46 -05:00
committed by Eamon Walsh
39 changed files with 911 additions and 350 deletions

View File

@@ -574,7 +574,6 @@ AllocateGCPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
/*
* pixmap private machinery
*/
#ifdef PIXPRIV
static int pixmapPrivateCount;
void
@@ -620,7 +619,6 @@ AllocatePixmapPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
pScreen->totalPixmapSize = BitmapBytePad(pScreen->totalPixmapSize * 8);
return TRUE;
}
#endif
/*