summaryrefslogtreecommitdiffstats
path: root/xup/xup.c
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 /xup/xup.c
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 'xup/xup.c')
-rw-r--r--xup/xup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xup/xup.c b/xup/xup.c
index 1d92fa60..21fdedd5 100644
--- a/xup/xup.c
+++ b/xup/xup.c
@@ -797,7 +797,7 @@ process_server_add_char(struct mod *mod, struct stream *s)
{
int rv;
int font;
- int charactor;
+ int character;
int x;
int y;
int cx;
@@ -806,14 +806,14 @@ process_server_add_char(struct mod *mod, struct stream *s)
char *bmpdata;
in_uint16_le(s, font);
- in_uint16_le(s, charactor);
+ in_uint16_le(s, character);
in_sint16_le(s, x);
in_sint16_le(s, y);
in_uint16_le(s, cx);
in_uint16_le(s, cy);
in_uint16_le(s, len_bmpdata);
in_uint8p(s, bmpdata, len_bmpdata);
- rv = mod->server_add_char(mod, font, charactor, x, y, cx, cy, bmpdata);
+ rv = mod->server_add_char(mod, font, character, x, y, cx, cy, bmpdata);
return rv;
}
@@ -825,7 +825,7 @@ process_server_add_char_alpha(struct mod *mod, struct stream *s)
{
int rv;
int font;
- int charactor;
+ int character;
int x;
int y;
int cx;
@@ -834,14 +834,14 @@ process_server_add_char_alpha(struct mod *mod, struct stream *s)
char *bmpdata;
in_uint16_le(s, font);
- in_uint16_le(s, charactor);
+ in_uint16_le(s, character);
in_sint16_le(s, x);
in_sint16_le(s, y);
in_uint16_le(s, cx);
in_uint16_le(s, cy);
in_uint16_le(s, len_bmpdata);
in_uint8p(s, bmpdata, len_bmpdata);
- rv = mod->server_add_char_alpha(mod, font, charactor, x, y, cx, cy,
+ rv = mod->server_add_char_alpha(mod, font, character, x, y, cx, cy,
bmpdata);
return rv;
}