[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.11-5-g7e5c04b

X2go dev team git-admin at x2go.org
Thu Mar 1 20:39:57 CET 2012


The branch, master has been updated
       via  7e5c04b5db4e859b326ece329099d849906f2bb9 (commit)
      from  655173ff215dde1a167193eafe29bfc955a19561 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7e5c04b5db4e859b326ece329099d849906f2bb9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 20:39:37 2012 +0100

    Pass address of fd_set structs on the stack to the FD_ISSET macro/function, instead of the struct itself.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    3 ++-
 .../051_nxcomp_macos105-fdisset.full+lite.patch    |   12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ff0f01e..f865f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
 
   [ Mihai Moldovan ]
   * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around
-    issue in Mac OS X 10.5 SDK.
+    issue in Mac OS X 10.5 SDK. Pass address of fd_set structs on the stack
+    to the FD_ISSET macro/function, instead of the struct itself.
 
   [ Oleksandr Shneyder ]
   * Create patch: 203_nxagent_disable-rootless-exit.full.patch.
diff --git a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch
index 86f24e8..6b78a6b 100644
--- a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch
+++ b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch
@@ -27,14 +27,14 @@ Author: Mihai Moldovan <ionic at ionic.de>
      *logofs << "Agent: remoteCanRead() is " <<
 -               (FD_ISSET(remoteFd_, readSet) && transport_ -> dequeuable() != 0)
 -            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readSet)
-+               (FD_ISSET(remoteFd_, readWorkSet) && transport_ -> dequeuable() != 0)
-+            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readWorkSet)
++               (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0)
++            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet)
              << " and dequeuable " << transport_ -> dequeuable()
              << ".\n" << logofs_flush;
      #endif
  
 -    return (FD_ISSET(remoteFd_, readSet) &&
-+    return (FD_ISSET(remoteFd_, readWorkSet) &&
++    return (FD_ISSET(remoteFd_, &readWorkSet) &&
                  transport_ -> dequeuable() != 0);
    }
  
@@ -47,16 +47,16 @@ Author: Mihai Moldovan <ionic at ionic.de>
      #if defined(TEST) || defined(INFO)
      *logofs << "Agent: remoteCanWrite() is " <<
 -               (FD_ISSET(remoteFd_, writeSet) && transport_ ->
-+               (FD_ISSET(remoteFd_, writeWorkSet) && transport_ ->
++               (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ ->
                 queuable() != 0 && canRead_ == 1) << " with FD_ISSET() "
 -            << (int) FD_ISSET(remoteFd_, writeSet) << " queueable "
-+            << (int) FD_ISSET(remoteFd_, writeWorkSet) << " queueable "
++            << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable "
              << transport_ -> queuable() << " channel can read "
              << canRead_ << ".\n" << logofs_flush;
      #endif
  
 -    return (FD_ISSET(remoteFd_, writeSet) &&
-+    return (FD_ISSET(remoteFd_, writeWorkSet) &&
++    return (FD_ISSET(remoteFd_, &writeWorkSet) &&
                  transport_ -> queuable() != 0 &&
                      canRead_ == 1);
    }


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list