summaryrefslogtreecommitdiffstats
path: root/vnc
diff options
context:
space:
mode:
Diffstat (limited to 'vnc')
-rw-r--r--vnc/Makefile.am6
-rw-r--r--vnc/vnc.c3
-rw-r--r--vnc/vnc.h2
3 files changed, 5 insertions, 6 deletions
diff --git a/vnc/Makefile.am b/vnc/Makefile.am
index 24835011..a9a3aa14 100644
--- a/vnc/Makefile.am
+++ b/vnc/Makefile.am
@@ -1,12 +1,10 @@
EXTRA_DIST = vnc.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 = \
diff --git a/vnc/vnc.c b/vnc/vnc.c
index 66b0f228..2e16ed21 100644
--- a/vnc/vnc.c
+++ b/vnc/vnc.c
@@ -1099,7 +1099,8 @@ lib_mod_connect(struct vnc *v)
if (error != 0)
{
- log_message(LOG_LEVEL_DEBUG, "VNC Error after security negotiation");
+ log_message(LOG_LEVEL_DEBUG, "VNC error %d after security negotiation",
+ error);
}
if (error == 0 && check_sec_result)
diff --git a/vnc/vnc.h b/vnc/vnc.h
index d7249f3d..af5e86e6 100644
--- a/vnc/vnc.h
+++ b/vnc/vnc.h
@@ -67,7 +67,7 @@ struct vnc
int (*server_set_pen)(struct vnc* v, int style,
int width);
int (*server_draw_line)(struct vnc* v, int x1, int y1, int x2, int y2);
- int (*server_add_char)(struct vnc* v, int font, int charactor,
+ int (*server_add_char)(struct vnc* v, int font, int character,
int offset, int baseline,
int width, int height, char* data);
int (*server_draw_text)(struct vnc* v, int font,