diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2012-07-17 10:05:26 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2012-07-17 10:05:26 -0700 |
| commit | b211b9be91a2775e31a0821d31d5e0a2ec942f60 (patch) | |
| tree | 6fa58e65650ab73987a37df3287870318c5fed6e /libxrdp/xrdp_channel.c | |
| parent | d8b8ca93b06be88836a491fa66b717272a090566 (diff) | |
| download | xrdp-proprietary-b211b9be91a2775e31a0821d31d5e0a2ec942f60.tar.gz xrdp-proprietary-b211b9be91a2775e31a0821d31d5e0a2ec942f60.zip | |
fix a define conflict with freerdp
Diffstat (limited to 'libxrdp/xrdp_channel.c')
| -rw-r--r-- | libxrdp/xrdp_channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libxrdp/xrdp_channel.c b/libxrdp/xrdp_channel.c index 092cefa4..2b3d23a5 100644 --- a/libxrdp/xrdp_channel.c +++ b/libxrdp/xrdp_channel.c @@ -95,19 +95,19 @@ xrdp_channel_send(struct xrdp_channel* self, struct stream* s, int channel_id, channel = xrdp_channel_get_item(self, channel_id); if (channel == NULL) { - g_writeln("xrdp_channel_send - no such channel"); + g_writeln("xrdp_channel_send - no such channel"); return 1; } s_pop_layer(s, channel_hdr); out_uint32_le(s, total_data_len); - if (channel->flags & CHANNEL_OPTION_SHOW_PROTOCOL) + if (channel->flags & XR_CHANNEL_OPTION_SHOW_PROTOCOL) { flags |= CHANNEL_FLAG_SHOW_PROTOCOL; } out_uint32_le(s, flags); if (xrdp_sec_send(self->sec_layer, s, channel->chanid) != 0) { - g_writeln("xrdp_channel_send - failure sending data"); + g_writeln("xrdp_channel_send - failure sending data"); return 1; } return 0; |