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_types.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_types.h')
| -rw-r--r-- | xrdp/xrdp_types.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h index 1e833d16..059a0c83 100644 --- a/xrdp/xrdp_types.h +++ b/xrdp/xrdp_types.h @@ -22,6 +22,9 @@ #define DEFAULT_STRING_LEN 255 #define LOG_WINDOW_CHAR_PER_LINE 60 + +#define MAX_NR_CHANNELS 16 +#define MAX_CHANNEL_NAME 16 /* lib */ struct xrdp_mod { @@ -288,6 +291,8 @@ struct xrdp_wm struct xrdp_bitmap* target_surface; /* either screen or os surface */ int current_surface_index; int hints; + int allowedchannels[MAX_NR_CHANNELS]; + int allowedinitialized ; }; /* rdp process */ |