Merge branch 'merge-a8' of a8git:xrdp into merge-a8

This commit is contained in:
Jim Grandy 2013-07-06 21:05:39 -07:00
commit 90446203d3

View File

@ -219,7 +219,7 @@ typedef rdpWindowRec* rdpWindowPtr;
#define RDI_IMGLY 3 /* lossy */ #define RDI_IMGLY 3 /* lossy */
#define RDI_LINE 4 #define RDI_LINE 4
#define RDI_SCRBLT 5 #define RDI_SCRBLT 5
define RDI_TEXT 6 #define RDI_TEXT 6
struct urdp_draw_item_fill struct urdp_draw_item_fill
{ {
@ -269,6 +269,7 @@ union urdp_draw_item
struct urdp_draw_item_img img; struct urdp_draw_item_img img;
struct urdp_draw_item_line line; struct urdp_draw_item_line line;
struct urdp_draw_item_scrblt scrblt; struct urdp_draw_item_scrblt scrblt;
struct urdp_draw_item_text text;
}; };
struct rdp_draw_item struct rdp_draw_item