GUAC-1164: Conditionally build display update channel support.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/4e2b90cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4e2b90cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4e2b90cc Branch: refs/heads/master Commit: 4e2b90cc0a6530134a91cafb82930750d85cc7b0 Parents: 2e73e5e Author: Michael Jumper <[email protected]> Authored: Tue Mar 15 21:59:28 2016 -0700 Committer: Michael Jumper <[email protected]> Committed: Tue Mar 15 21:59:28 2016 -0700 ---------------------------------------------------------------------- src/protocols/rdp/rdp_disp.c | 5 ++++- src/protocols/rdp/rdp_disp.h | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4e2b90cc/src/protocols/rdp/rdp_disp.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_disp.c b/src/protocols/rdp/rdp_disp.c index ea65289..ee2d627 100644 --- a/src/protocols/rdp/rdp_disp.c +++ b/src/protocols/rdp/rdp_disp.c @@ -27,10 +27,13 @@ #include "rdp_settings.h" #include <freerdp/freerdp.h> -#include <freerdp/client/disp.h> #include <guacamole/client.h> #include <guacamole/timestamp.h> +#ifdef HAVE_FREERDP_CLIENT_DISP_H +#include <freerdp/client/disp.h> +#endif + guac_rdp_disp* guac_rdp_disp_alloc() { guac_rdp_disp* disp = malloc(sizeof(guac_rdp_disp)); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4e2b90cc/src/protocols/rdp/rdp_disp.h ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_disp.h b/src/protocols/rdp/rdp_disp.h index eb33047..b2516b5 100644 --- a/src/protocols/rdp/rdp_disp.h +++ b/src/protocols/rdp/rdp_disp.h @@ -25,9 +25,12 @@ #include "rdp_settings.h" -#include <freerdp/client/disp.h> #include <freerdp/freerdp.h> +#ifdef HAVE_FREERDP_CLIENT_DISP_H +#include <freerdp/client/disp.h> +#endif + /** * The minimum value for width or height, in pixels. */ @@ -49,10 +52,12 @@ */ typedef struct guac_rdp_disp { +#ifdef HAVE_FREERDP_DISPLAY_UPDATE_SUPPORT /** * Display control interface. */ DispClientContext* disp; +#endif /** * The timestamp of the last display update request, or 0 if no request
