o fixed some issues that may have cropped up due to mistakes I did during the merge

or these issues could have been a result of astyle not working correctly (unlikely though)

xorg/X11R7.6/rdp/rdpCopyArea.c

@@ -615,3 +615,4 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
 
         return rv;
     }
+}

xorg/X11R7.6/rdp/rdpFillSpans.c

@@ -98,3 +98,5 @@ rdpFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nInit,
         RegionUninit(&clip_reg);
         rdpup_switch_os_surface(-1);
     }
+}
+

xorg/X11R7.6/rdp/rdpSetSpans.c

@@ -163,3 +163,5 @@ rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
             rdpup_switch_os_surface(-1);
         }
     }
+}
+

xorg/X11R7.6/rdp/rdpup.c

@@ -1762,7 +1762,6 @@ rdpup_create_window(WindowPtr pWindow, rdpWindowRec *priv)
 
     out_uint32_le(g_out_s, flags); /* flags */
 }
-}
 
 /******************************************************************************/
 void
@@ -1895,23 +1894,20 @@ rdpup_check_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec *pDirtyPriv)
                 rdpup_reset_clip();
                 rdpup_set_opcode(GXcopy);
                 break;
+
+            case RDI_SCRBLT:
+                LLOGLN(10, ("  RDI_SCRBLT"));
+                break;
         }
 
-        rdpup_reset_clip();
-        rdpup_set_opcode(GXcopy);
-        break;
-    case RDI_SCRBLT:
-        LLOGLN(10, ("  RDI_SCRBLT"));
-        break;
+        di = di->next;
     }
 
-    di = di->next;
-}
-draw_item_remove_all(pDirtyPriv);
-rdpup_end_update();
-pDirtyPriv->is_dirty = 0;
-                       rdpup_switch_os_surface(-1);
-                       return 0;
+    draw_item_remove_all(pDirtyPriv);
+    rdpup_end_update();
+    pDirtyPriv->is_dirty = 0;
+    rdpup_switch_os_surface(-1);
+    return 0;
 }
 
                               /******************************************************************************/