diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2013-08-24 16:40:40 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2013-08-24 16:40:40 -0700 |
| commit | 1fb8fd9b974aebfec718eea2bbd89c000c7ae350 (patch) | |
| tree | 82be94f7ab45b98ccc35d1afc09fb64a8e50ab7b /libxrdp/xrdp_rdp.c | |
| parent | 1c3d23da37923f59f50509d3939d1b9b8f81e108 (diff) | |
| parent | da7a005a59f89961259511d1ee8bb04906f089dd (diff) | |
| download | xrdp-proprietary-1fb8fd9b974aebfec718eea2bbd89c000c7ae350.tar.gz xrdp-proprietary-1fb8fd9b974aebfec718eea2bbd89c000c7ae350.zip | |
Merge pull request #2 from speidy/master
neutrinordp: clean old freerdp moduels, add config, fix for RFX codec to work.
Diffstat (limited to 'libxrdp/xrdp_rdp.c')
| -rw-r--r-- | libxrdp/xrdp_rdp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index 93219968..8ca9f799 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -21,7 +21,7 @@ #include "libxrdp.h" #include "log.h" -#if defined(XRDP_FREERDP1) +#if defined(XRDP_NEUTRINORDP) #include <freerdp/codec/rfx.h> #endif @@ -146,7 +146,7 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) return 0; } -#if defined(XRDP_FREERDP1) +#if defined(XRDP_NEUTRINORDP) /*****************************************************************************/ static void cpuid(tui32 info, tui32 *eax, tui32 *ebx, tui32 *ecx, tui32 *edx) @@ -227,7 +227,7 @@ xrdp_rdp_create(struct xrdp_session *session, struct trans *trans) bytes = sizeof(self->client_info.client_ip) - 1; g_write_ip_address(trans->sck, self->client_info.client_ip, bytes); self->mppc_enc = mppc_enc_new(PROTO_RDP_50); -#if defined(XRDP_FREERDP1) +#if defined(XRDP_NEUTRINORDP) self->rfx_enc = rfx_context_new(); rfx_context_set_cpu_opt(self->rfx_enc, xrdp_rdp_detect_cpu()); #endif @@ -247,7 +247,7 @@ xrdp_rdp_delete(struct xrdp_rdp *self) xrdp_sec_delete(self->sec_layer); mppc_enc_free(self->mppc_enc); -#if defined(XRDP_FREERDP1) +#if defined(XRDP_NEUTRINORDP) rfx_context_free((RFX_CONTEXT *)(self->rfx_enc)); #endif g_free(self); |