xserver: Branch 'master'

[Adam Jackson]

 dix/privates.c           |    1 -
 include/privates.h       |    1 -
 miext/damage/damage.c    |    4 ++--
 miext/damage/damagestr.h |    1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 4e76c2711740b775242170d8e5ee56c7e6829cce
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 20 13:42:12 2017 -0400

    dix: Remove PRIVATE_DAMAGE
    
    None of this is actually wired up to anything, so we can also remove the
    devPrivates from the DamageRec. The DamageExtRec is what would need
    devPrivates for selinux labeling, in principle.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/dix/privates.c b/dix/privates.c
index 478f52cbe..9a4e61138 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -105,7 +105,6 @@ static const char *key_names[PRIVATE_LAST] = {
     [PRIVATE_CURSOR_BITS] = "CURSOR_BITS",
 
     /* extension privates */
-    [PRIVATE_DAMAGE] = "DAMAGE",
     [PRIVATE_GLYPH] = "GLYPH",
     [PRIVATE_GLYPHSET] = "GLYPHSET",
     [PRIVATE_PICTURE] = "PICTURE",
diff --git a/include/privates.h b/include/privates.h
index a2bb1a43c..e89c3e440 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -46,7 +46,6 @@ typedef enum {
     PRIVATE_CURSOR_BITS,
 
     /* extension privates */
-    PRIVATE_DAMAGE,
     PRIVATE_GLYPH,
     PRIVATE_GLYPHSET,
     PRIVATE_PICTURE,
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 2fae03fc2..de14d5cc8 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -1696,7 +1696,7 @@ DamageCreate(DamageReportFunc damageReport,
     damageScrPriv(pScreen);
     DamagePtr pDamage;
 
-    pDamage = dixAllocateObjectWithPrivates(DamageRec, PRIVATE_DAMAGE);
+    pDamage = calloc(1, sizeof(DamageRec));
     if (!pDamage)
         return 0;
     pDamage->pNext = 0;
@@ -1821,7 +1821,7 @@ DamageDestroy(DamagePtr pDamage)
     (*pScrPriv->funcs.Destroy) (pDamage);
     RegionUninit(&pDamage->damage);
     RegionUninit(&pDamage->pendingDamage);
-    dixFreeObjectWithPrivates(pDamage, PRIVATE_DAMAGE);
+    free(pDamage);
 }
 
 Bool
diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h
index 278615634..0d07872e5 100644
--- a/miext/damage/damagestr.h
+++ b/miext/damage/damagestr.h
@@ -49,7 +49,6 @@ typedef struct _damage {
     Bool reportAfter;
     RegionRec pendingDamage;    /* will be flushed post submission at the latest */
     ScreenPtr pScreen;
-    PrivateRec *devPrivates;
 } DamageRec;
 
 typedef struct _damageScrPriv {