Merge branch 'master' into XACE-SELINUX

2007-03-07 09:03:46 -05:00
parent 74175e0af7 e9bfb2b3d7
commit bb111291d8
39 changed files with 911 additions and 350 deletions
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -280,10 +280,8 @@ _X_HIDDEN void *dixLookupTab[] = {
    SYMFUNC(AllocateColormapPrivateIndex)
    SYMFUNC(AllocateDevicePrivateIndex)
    SYMFUNC(AllocateDevicePrivate)
-#ifdef PIXPRIV
    SYMFUNC(AllocatePixmapPrivateIndex)
    SYMFUNC(AllocatePixmapPrivate)
-#endif
    /* resource.c */
    SYMFUNC(AddResource)
    SYMFUNC(ChangeResourceValue)