Fix 051_nxcomp_macos105-fdisset.full+lite.patch. Pass address of fd_set structs on the stack to the FD_ISSET macro/function, instead of the struct itself. Signed-off-by: Mihai Moldovan --- .../051_nxcomp_macos105-fdisset.full+lite.patch | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) 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 *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 #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); } -- 1.7.8.4