summaryrefslogtreecommitdiffstats
path: root/xrdp/xrdp.h
diff options
context:
space:
mode:
authorItamar Reis Peixoto <itamar@ispbrasil.com.br>2016-02-08 22:37:44 -0200
committerItamar Reis Peixoto <itamar@ispbrasil.com.br>2016-02-08 22:37:44 -0200
commitee436aeec9385a77cb547384575bcc2f9ad2746c (patch)
treed7fc2f98e36a9c06713284e450ad9bf98653346e /xrdp/xrdp.h
parent40a197e7a8960fdaefb1e4bd90344c5734bd9e77 (diff)
parent2a5d204baaa84207e835af570d89b10a17083fae (diff)
downloadxrdp-proprietary-ee436aeec9385a77cb547384575bcc2f9ad2746c.tar.gz
xrdp-proprietary-ee436aeec9385a77cb547384575bcc2f9ad2746c.zip
Merge pull request #309 from proski/devel
Fixes for autotools, compile warnings and MacOS compatibility
Diffstat (limited to 'xrdp/xrdp.h')
-rw-r--r--xrdp/xrdp.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h
index b23cdaf0..1199d01a 100644
--- a/xrdp/xrdp.h
+++ b/xrdp/xrdp.h
@@ -381,6 +381,8 @@ int APP_CC
xrdp_mm_check_chan(struct xrdp_mm *self);
int APP_CC
xrdp_mm_check_wait_objs(struct xrdp_mm* self);
+int APP_CC
+xrdp_mm_frame_ack(struct xrdp_mm *self, int frame_id);
int DEFAULT_CC
server_begin_update(struct xrdp_mod* mod);
int DEFAULT_CC
@@ -444,7 +446,7 @@ server_set_pen(struct xrdp_mod* mod, int style, int width);
int DEFAULT_CC
server_draw_line(struct xrdp_mod* mod, int x1, int y1, int x2, int y2);
int DEFAULT_CC
-server_add_char(struct xrdp_mod* mod, int font, int charactor,
+server_add_char(struct xrdp_mod* mod, int font, int character,
int offset, int baseline,
int width, int height, char* data);
int DEFAULT_CC
@@ -509,6 +511,6 @@ server_monitored_desktop(struct xrdp_mod* mod,
struct rail_monitored_desktop_order* mdo,
int flags);
int DEFAULT_CC
-server_add_char_alpha(struct xrdp_mod* mod, int font, int charactor,
+server_add_char_alpha(struct xrdp_mod* mod, int font, int character,
int offset, int baseline,
int width, int height, char* data);