[debian-edu-commits] debian-edu/pkg-team/ 88/159: fix FTBFS, better fix (my excuse: m and w look so similar on-screen…)

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit c94af5ebaa3ebd5cb8c5ba52d4df06479c37beb3
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 26 21:19:58 2015 +0200

    fix FTBFS, better fix (my excuse: m and w look so similar on-screen…)
---
 patches/misc-fixes.diff | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/patches/misc-fixes.diff b/patches/misc-fixes.diff
index 90b743d..021fd97 100644
--- a/patches/misc-fixes.diff
+++ b/patches/misc-fixes.diff
@@ -123,17 +123,17 @@
              memset(&set, 0, sizeof(set));
              set.rules = "base";
              set.model = "pc104";
---- a/xrdp/xrdp_mm.c
-+++ b/xrdp/xrdp_mm.c
-@@ -2274,7 +2274,7 @@ xrdp_mm_check_wait_objs(struct xrdp_mm *
- 
- /*****************************************************************************/
- /* frame ack from client */
--int APP_CC
-+static int APP_CC
- xrdp_mm_frame_ack(struct xrdp_mm *self, int frame_id)
- {
-     int ex;
+--- a/xrdp/xrdp.h
++++ b/xrdp/xrdp.h
+@@ -381,6 +381,8 @@ int APP_CC
+ xrdp_mm_check_chan(struct xrdp_mm *self);
+ int APP_CC
+ xrdp_mm_check_wait_objs(struct xrdp_mm* self);
++int APP_CC
++xrdp_mm_frame_ack(struct xrdp_mm *self, int frame_id);
+ int DEFAULT_CC
+ server_begin_update(struct xrdp_mod* mod);
+ int DEFAULT_CC
 --- a/xrdpapi/xrdpapi.c
 +++ b/xrdpapi/xrdpapi.c
 @@ -36,6 +36,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git