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_orders.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_orders.c')
| -rw-r--r-- | libxrdp/xrdp_orders.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c index b8e1c31e..f753371d 100644 --- a/libxrdp/xrdp_orders.c +++ b/libxrdp/xrdp_orders.c @@ -20,7 +20,7 @@ #include "libxrdp.h" -#if defined(XRDP_FREERDP1) +#if defined(XRDP_NEUTRINORDP) #include <freerdp/codec/rfx.h> #endif @@ -2248,7 +2248,7 @@ xrdp_orders_send_as_jpeg(struct xrdp_orders *self, return 1; } -#if defined(XRDP_FREERDP1) +#if defined(XRDP_NEUTRINORDP) /*****************************************************************************/ /* secondary drawing order (bitmap v3) using remotefx compression */ static int APP_CC @@ -2326,7 +2326,7 @@ xrdp_orders_send_bitmap3(struct xrdp_orders *self, struct stream *xr_s; /* xrdp stream */ struct stream *temp_s; /* xrdp stream */ struct xrdp_client_info *ci; -#if defined(XRDP_FREERDP1) +#if defined(XRDP_NEUTRINORDP) STREAM *fr_s; /* FreeRDP stream */ RFX_CONTEXT *context; RFX_RECT rect; @@ -2341,7 +2341,7 @@ xrdp_orders_send_bitmap3(struct xrdp_orders *self, if (ci->v3_codec_id == ci->rfx_codec_id) { -#if defined(XRDP_FREERDP1) +#if defined(XRDP_NEUTRINORDP) if (!xrdp_orders_send_as_rfx(self, width, height, bpp, hints)) { |