aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-02-09 15:31:46 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:32:26 +0100
commitbd10fe5919594afe37d0019bf58c359e79b54979 (patch)
tree936b63fc4b8bf7e14a544447dffceec8d28f1df6
parentf6619070bad8c20f8467ceb3c161d7699cc00aff (diff)
downloadnx-libs-bd10fe5919594afe37d0019bf58c359e79b54979.tar.gz
nx-libs-bd10fe5919594afe37d0019bf58c359e79b54979.tar.bz2
nx-libs-bd10fe5919594afe37d0019bf58c359e79b54979.zip
Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch) (029_nxcomp_ppc64.full+lite.patch)
-rw-r--r--debian/patches/029_nxcomp_ppc64.full+lite.patch17
-rw-r--r--debian/patches/series1
-rw-r--r--nxcomp/Loop.cpp4
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 9d454d5db..000000000
--- 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@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 b184a1fb0..de6e0905a 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 6fd772912..7e2b990de 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)
{