[X2Go-Commits] [nx-libs] 21/29: Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch) (029_nxcomp_ppc64.full+lite.patch)

[git-admin at x2go.org]

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

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit bd10fe5919594afe37d0019bf58c359e79b54979
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 9 15:31:46 2015 +0100

    Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch) (029_nxcomp_ppc64.full+lite.patch)
---
 debian/patches/029_nxcomp_ppc64.full+lite.patch |   17 -----------------
 debian/patches/series                           |    1 -
 nxcomp/Loop.cpp                                 |    4 ++--
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/debian/patches/029_nxcomp_ppc64.full+lite.patch b/debian/patches/029_nxcomp_ppc64.full+lite.patch
deleted file mode 100644
index 9d454d5..0000000
--- a/debian/patches/029_nxcomp_ppc64.full+lite.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch)
-Author: Mihai Moldovan <ionic at ionic.de>
-
---- 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)
-       {
diff --git a/debian/patches/series b/debian/patches/series
index b184a1f..de6e090 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-029_nxcomp_ppc64.full+lite.patch
 030_nx-X11_configure-args.full.patch
 031_nx-X11_parallel-make.full.patch
 051_nxcomp_macos105-fdisset.full+lite.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 6fd7729..7e2b990 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6832,9 +6832,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)
       {

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git