diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-15 01:03:15 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-15 01:03:15 +0200 |
| commit | 359c458f1af169ad28cb032fa20077124992624d (patch) | |
| tree | 8c90fd8816c5d33890f72bd51a0a677f027908a9 | |
| parent | ecd6d4e8501004c3c778b2a69cefe3f4f3272308 (diff) | |
| download | nx-libs-359c458f1af169ad28cb032fa20077124992624d.tar.gz nx-libs-359c458f1af169ad28cb032fa20077124992624d.tar.bz2 nx-libs-359c458f1af169ad28cb032fa20077124992624d.zip | |
update last committed patch, fix EOL style
| -rw-r--r-- | debian/patches/029_nxcomp_ppc64.full+lite.patch | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/debian/patches/029_nxcomp_ppc64.full+lite.patch b/debian/patches/029_nxcomp_ppc64.full+lite.patch index 8040925ba..f9fd749ee 100644 --- a/debian/patches/029_nxcomp_ppc64.full+lite.patch +++ b/debian/patches/029_nxcomp_ppc64.full+lite.patch @@ -1,16 +1,14 @@ -diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
-index c9617c3..955be85 100644
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -6854,9 +6854,9 @@ int WaitForRemote(int portNum)
- {
- sockaddr_in newAddr;
-
-- size_t addrLen = sizeof(sockaddr_in);
-+ socklen_t addrLen = sizeof(sockaddr_in);
-
-- newFD = accept(proxyFD, (sockaddr *) &newAddr, (socklen_t *) &addrLen);
-+ newFD = accept(proxyFD, (sockaddr *) &newAddr, &addrLen);
-
- if (newFD == -1)
- {
+--- a/nxcomp/Loop.cpp ++++ b/nxcomp/Loop.cpp +@@ -6832,9 +6832,9 @@ + { + sockaddr_in newAddr; + +- size_t addrLen = sizeof(sockaddr_in); ++ socklen_t addrLen = sizeof(sockaddr_in); + +- newFD = accept(proxyFD, (sockaddr *) &newAddr, (socklen_t *) &addrLen); ++ newFD = accept(proxyFD, (sockaddr *) &newAddr, &addrLen); + + if (newFD == -1) + { |