GUAC-1164: Do not include disply update channel functionsn unless display update channel support is present.
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/fc71dcad Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/fc71dcad Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/fc71dcad Branch: refs/heads/master Commit: fc71dcadb00fe892400ed8ea0290aad88102f6f8 Parents: 81ebfbb Author: Michael Jumper <[email protected]> Authored: Tue Mar 15 22:07:38 2016 -0700 Committer: Michael Jumper <[email protected]> Committed: Tue Mar 15 22:07:38 2016 -0700 ---------------------------------------------------------------------- src/protocols/rdp/rdp_disp.c | 2 ++ src/protocols/rdp/rdp_disp.h | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fc71dcad/src/protocols/rdp/rdp_disp.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_disp.c b/src/protocols/rdp/rdp_disp.c index ee2d627..cd18cb3 100644 --- a/src/protocols/rdp/rdp_disp.c +++ b/src/protocols/rdp/rdp_disp.c @@ -72,9 +72,11 @@ void guac_rdp_disp_load_plugin(rdpContext* context) { } +#ifdef HAVE_FREERDP_DISPLAY_UPDATE_SUPPORT void guac_rdp_disp_connect(guac_rdp_disp* guac_disp, DispClientContext* disp) { guac_disp->disp = disp; } +#endif /** * Fits a given dimension within the allowed bounds for Display Update http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fc71dcad/src/protocols/rdp/rdp_disp.h ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_disp.h b/src/protocols/rdp/rdp_disp.h index b2516b5..d246271 100644 --- a/src/protocols/rdp/rdp_disp.h +++ b/src/protocols/rdp/rdp_disp.h @@ -107,6 +107,7 @@ void guac_rdp_disp_free(guac_rdp_disp* disp); */ void guac_rdp_disp_load_plugin(rdpContext* context); +#ifdef HAVE_FREERDP_DISPLAY_UPDATE_SUPPORT /** * Stores the given DispClientContext within the given guac_rdp_disp, such that * display updates can be properly sent. Until this is called, changes to the @@ -118,6 +119,7 @@ void guac_rdp_disp_load_plugin(rdpContext* context); * display update channel. */ void guac_rdp_disp_connect(guac_rdp_disp* guac_disp, DispClientContext* disp); +#endif /** * Requests a display size update, which may then be sent immediately to the
