From a340d550db539443d90ecd9fb86671ed650e9edf Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Thu, 26 Sep 2013 13:30:49 -0700
Subject: [PATCH] X11rdp: fix after a8 merge

---
 xorg/X11R7.6/rdp/rdp.h     |  4 ----
 xorg/X11R7.6/rdp/rdpdraw.c | 30 ------------------------------
 2 files changed, 34 deletions(-)

diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h
index 63c7436a..32d05d6a 100644
--- a/xorg/X11R7.6/rdp/rdp.h
+++ b/xorg/X11R7.6/rdp/rdp.h
@@ -301,10 +301,6 @@ struct _rdpPixmapRec
      then we force remote the pixmap */
   int use_count;
   int kind_width;
-  /* number of times used in a remote operation
-     if this gets above XRDP_USE_COUNT_THRESHOLD
-     then we force remote the pixmap */
-  int use_count;
   struct rdp_draw_item* draw_item_head;
   struct rdp_draw_item* draw_item_tail;
 };
diff --git a/xorg/X11R7.6/rdp/rdpdraw.c b/xorg/X11R7.6/rdp/rdpdraw.c
index 0f31862e..e276c0b7 100644
--- a/xorg/X11R7.6/rdp/rdpdraw.c
+++ b/xorg/X11R7.6/rdp/rdpdraw.c
@@ -488,36 +488,6 @@ draw_item_remove_all(rdpPixmapRec *priv)
     return 0;
 }
 
-/******************************************************************************/
-static int
-remove_empties(rdpPixmapRec* priv)
-{
-    struct rdp_draw_item* di;
-    struct rdp_draw_item* di_prev;
-    int rv;
-
-    rv = 0;
-    /* remove draw items with empty regions */
-    di = priv->draw_item_head;
-    di_prev = 0;
-    while (di != 0)
-    {
-        if (!RegionNotEmpty(di->reg))
-        {
-            LLOGLN(10, ("remove_empties: removing empty item type %d", di->type));
-            draw_item_remove(priv, di);
-            di = di_prev == 0 ? priv->draw_item_head : di_prev->next;
-            rv++;
-        }
-        else
-        {
-            di_prev = di;
-            di = di->next;
-        }
-    }
-    return rv;
-}
-
 /******************************************************************************/
 int
 region_get_pixel_count(RegionPtr reg)