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 /xrdp/xrdp_mm.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 'xrdp/xrdp_mm.c')
| -rw-r--r-- | xrdp/xrdp_mm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index 48a0d628..26e5c028 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -2014,7 +2014,7 @@ xrdp_mm_connect(struct xrdp_mm *self) xrdp_mm_connect_chansrv(self, "", chansrvport); } - log_message(LOG_LEVEL_DEBUG,"returnvalue from xrdp_mm_connect %d", rv); + log_message(LOG_LEVEL_DEBUG,"return value from xrdp_mm_connect %d", rv); return rv; } @@ -2833,7 +2833,7 @@ 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) { @@ -2847,7 +2847,7 @@ server_add_char(struct xrdp_mod *mod, int font, int charactor, fi.data = data; fi.bpp = 1; return libxrdp_orders_send_font(((struct xrdp_wm *)mod->wm)->session, - &fi, font, charactor); + &fi, font, character); } /*****************************************************************************/ @@ -3470,7 +3470,7 @@ server_monitored_desktop(struct xrdp_mod *mod, /*****************************************************************************/ 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) { @@ -3484,5 +3484,5 @@ server_add_char_alpha(struct xrdp_mod* mod, int font, int charactor, fi.data = data; fi.bpp = 8; return libxrdp_orders_send_font(((struct xrdp_wm*)mod->wm)->session, - &fi, font, charactor); + &fi, font, character); } |