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 /mc | |
| 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 'mc')
| -rw-r--r-- | mc/Makefile.am | 6 | ||||
| -rw-r--r-- | mc/mc.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mc/Makefile.am b/mc/Makefile.am index eb000085..f56dac5f 100644 --- a/mc/Makefile.am +++ b/mc/Makefile.am @@ -1,12 +1,10 @@ EXTRA_DIST = mc.h -AM_CFLAGS = \ +AM_CPPFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ - -DXRDP_PID_PATH=\"${localstatedir}/run\" - -INCLUDES = \ + -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common lib_LTLIBRARIES = \ @@ -67,7 +67,7 @@ struct mod int (*server_set_pen)(struct mod* v, int style, int width); int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2); - int (*server_add_char)(struct mod* v, int font, int charactor, + int (*server_add_char)(struct mod* v, int font, int character, int offset, int baseline, int width, int height, char* data); int (*server_draw_text)(struct mod* v, int font, |