Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
7e5c04b5
Commit
7e5c04b5
authored
Mar 01, 2012
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass address of fd_set structs on the stack to the FD_ISSET macro/function,…
Pass address of fd_set structs on the stack to the FD_ISSET macro/function, instead of the struct itself.
parent
655173ff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
changelog
debian/changelog
+2
-1
051_nxcomp_macos105-fdisset.full+lite.patch
debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch
+6
-6
No files found.
debian/changelog
View file @
7e5c04b5
...
...
@@ -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.
...
...
debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch
View file @
7e5c04b5
...
...
@@ -27,14 +27,14 @@ Author: Mihai Moldovan <ionic@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@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);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment