diff options
| author | norrarvid <norrarvid@gmail.com> | 2012-06-18 09:45:42 +0200 |
|---|---|---|
| committer | norrarvid <norrarvid@gmail.com> | 2012-06-18 09:45:42 +0200 |
| commit | e87ec5072169e201c41bfb1ad70f78b549fc2767 (patch) | |
| tree | 3f0accf2afe52678bfdd107db600fd1a86f9511b /xrdp/xrdp.h | |
| parent | d2903cd1fc2f02fd08ea0b55117a3a03e7131504 (diff) | |
| parent | fc49bf6b48878e9514fee3e3c8eb13789aefc71f (diff) | |
| download | xrdp-proprietary-e87ec5072169e201c41bfb1ad70f78b549fc2767.tar.gz xrdp-proprietary-e87ec5072169e201c41bfb1ad70f78b549fc2767.zip | |
fix minor merge conflict
Diffstat (limited to 'xrdp/xrdp.h')
| -rw-r--r-- | xrdp/xrdp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h index 2ef81659..5ce2ee9b 100644 --- a/xrdp/xrdp.h +++ b/xrdp/xrdp.h @@ -417,6 +417,8 @@ server_draw_text(struct xrdp_mod* mod, int font, int x, int y, char* data, int data_len); int DEFAULT_CC server_reset(struct xrdp_mod* mod, int width, int height, int bpp); +int DEFAULT_CC +is_channel_allowed(struct xrdp_wm* wm, int channel_id); int DEFAULT_CC server_query_channel(struct xrdp_mod* mod, int index, char* channel_name, int* channel_flags); |