summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Grandy <jgrandy@authentic8.com>2013-07-06 21:05:39 -0700
committerJim Grandy <jgrandy@authentic8.com>2013-07-06 21:05:39 -0700
commit90446203d3ebcebf295bf36c95c0296a7484f9a6 (patch)
tree0d97ec11718a9a571a2c226993b0cf3d8b7ba382
parenta27cbddaa57ea6504b023ada1f77cda372c32275 (diff)
parent0054b70446ae5024e1c8cd5fd7bbe21c8591c592 (diff)
downloadxrdp-proprietary-90446203d3ebcebf295bf36c95c0296a7484f9a6.tar.gz
xrdp-proprietary-90446203d3ebcebf295bf36c95c0296a7484f9a6.zip
Merge branch 'merge-a8' of a8git:xrdp into merge-a8
-rw-r--r--xorg/X11R7.6/rdp/rdp.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h
index 655c536c..85a52645 100644
--- a/xorg/X11R7.6/rdp/rdp.h
+++ b/xorg/X11R7.6/rdp/rdp.h
@@ -219,7 +219,7 @@ typedef rdpWindowRec* rdpWindowPtr;
#define RDI_IMGLY 3 /* lossy */
#define RDI_LINE 4
#define RDI_SCRBLT 5
-define RDI_TEXT 6
+#define RDI_TEXT 6
struct urdp_draw_item_fill
{
@@ -269,6 +269,7 @@ union urdp_draw_item
struct urdp_draw_item_img img;
struct urdp_draw_item_line line;
struct urdp_draw_item_scrblt scrblt;
+ struct urdp_draw_item_text text;
};
struct rdp_draw_item