diff options
| author | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2016-02-08 22:37:44 -0200 |
|---|---|---|
| committer | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2016-02-08 22:37:44 -0200 |
| commit | ee436aeec9385a77cb547384575bcc2f9ad2746c (patch) | |
| tree | d7fc2f98e36a9c06713284e450ad9bf98653346e /xorg/X11R7.6/rdp/rdpup.c | |
| parent | 40a197e7a8960fdaefb1e4bd90344c5734bd9e77 (diff) | |
| parent | 2a5d204baaa84207e835af570d89b10a17083fae (diff) | |
| download | xrdp-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 'xorg/X11R7.6/rdp/rdpup.c')
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c index 9c507622..230c1538 100644 --- a/xorg/X11R7.6/rdp/rdpup.c +++ b/xorg/X11R7.6/rdp/rdpup.c @@ -2823,7 +2823,7 @@ rdpup_check_alpha_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec* pDirtyPriv) /******************************************************************************/ int -rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy, +rdpup_add_char(int font, int character, short x, short y, int cx, int cy, char* bmpdata, int bmpdata_bytes) { if (g_connected) @@ -2834,7 +2834,7 @@ rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy, out_uint16_le(g_out_s, 18 + bmpdata_bytes); /* size */ g_count++; out_uint16_le(g_out_s, font); - out_uint16_le(g_out_s, charactor); + out_uint16_le(g_out_s, character); out_uint16_le(g_out_s, x); out_uint16_le(g_out_s, y); out_uint16_le(g_out_s, cx); @@ -2847,7 +2847,7 @@ rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy, /******************************************************************************/ int -rdpup_add_char_alpha(int font, int charactor, short x, short y, int cx, int cy, +rdpup_add_char_alpha(int font, int character, short x, short y, int cx, int cy, char* bmpdata, int bmpdata_bytes) { if (g_connected) @@ -2858,7 +2858,7 @@ rdpup_add_char_alpha(int font, int charactor, short x, short y, int cx, int cy, out_uint16_le(g_out_s, 18 + bmpdata_bytes); /* size */ g_count++; out_uint16_le(g_out_s, font); - out_uint16_le(g_out_s, charactor); + out_uint16_le(g_out_s, character); out_uint16_le(g_out_s, x); out_uint16_le(g_out_s, y); out_uint16_le(g_out_s, cx); |