[PATCH] Fix compilation with FreeRdp 1.1 and master

[Kristian Høgsberg]

On Mon, Dec 09, 2013 at 10:16:39PM +0100, Hardening wrote:
> The API to use remoteFx encoding has changed between master and stable 1.1
> branch. This patch fixes compilation for both.
> Please note that the freerdp/version.h file is generated in the very last versions
> of FreeRdp so be sure to update/install the last versions.

Yeah, this doesn't compile for me with an older FreeRdp because of the
missing freerdp/version.h.  If we're going to require a newer FreeRdp
for this to compile, can we just drop the #if?  Or is version.h
included by freedrp.h or something so we can avoid the version.h
#include?

Kristian

> ---
>  src/compositor-rdp.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/src/compositor-rdp.c b/src/compositor-rdp.c
> index 8a302f8..5a2da45 100644
> --- a/src/compositor-rdp.c
> +++ b/src/compositor-rdp.c
> @@ -27,6 +27,7 @@
>  #include <errno.h>
>  #include <linux/input.h>
>  
> +#include <freerdp/version.h>
>  #include <freerdp/freerdp.h>
>  #include <freerdp/listener.h>
>  #include <freerdp/update.h>
> @@ -574,7 +575,11 @@ rdp_peer_context_new(freerdp_peer* client, RdpPeerContext* context)
>  	context->item.peer = client;
>  	context->item.flags = RDP_PEER_OUTPUT_ENABLED;
>  
> +#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR == 1
>  	context->rfx_context = rfx_context_new();
> +#else
> +	context->rfx_context = rfx_context_new(0);
> +#endif
>  	context->rfx_context->mode = RLGR3;
>  	context->rfx_context->width = client->settings->DesktopWidth;
>  	context->rfx_context->height = client->settings->DesktopHeight;
> -- 
> 1.8.1.2
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel