guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [11/26] incubator-guacamole-server git commit: GUACAMOLE-25: Fix configure test for FreeRDP variations.
Date Thu, 02 Jun 2016 18:45:18 GMT
GUACAMOLE-25: Fix configure test for FreeRDP variations.


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/4e4dbd6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4e4dbd6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4e4dbd6a

Branch: refs/heads/master
Commit: 4e4dbd6a2d9e882a2a23baf758a209621b5334fc
Parents: 9d5871a
Author: Michael Jumper <mjumper@apache.org>
Authored: Wed Apr 20 22:02:01 2016 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Wed May 25 13:50:28 2016 -0700

----------------------------------------------------------------------
 configure.ac                           | 6 +++++-
 src/protocols/rdp/guac_ai/ai_service.c | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4e4dbd6a/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 04cb6bb..7dec629 100644
--- a/configure.ac
+++ b/configure.ac
@@ -779,7 +779,11 @@ then
                                             wStream* stream);
                                         IWTSVirtualChannelCallback cb = {
                                             .OnDataReceived = __data_received
-                                        };]])],
+                                        };
+                                        int main() {
+                                            return
+                                                cb.OnDataReceived(NULL, NULL);
+                                        }]])],
                       [AC_MSG_RESULT([yes])],
                       [AC_MSG_RESULT([no])
                        AC_DEFINE([LEGACY_IWTSVIRTUALCHANNELCALLBACK],,

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4e4dbd6a/src/protocols/rdp/guac_ai/ai_service.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/guac_ai/ai_service.c b/src/protocols/rdp/guac_ai/ai_service.c
index 945f039..2fbf2ac 100644
--- a/src/protocols/rdp/guac_ai/ai_service.c
+++ b/src/protocols/rdp/guac_ai/ai_service.c
@@ -95,7 +95,7 @@ static void guac_rdp_ai_handle_data(guac_client* client,
 
 }
 
-#if LEGACY_IWTSVIRTUALCHANNELCALLBACK
+#ifdef LEGACY_IWTSVIRTUALCHANNELCALLBACK
 /**
  * Callback which is invoked when data is received along a connection to the
  * AUDIO_INPUT plugin. This callback is specific to FreeRDP 1.1 and older.


Mime
View raw message