aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/xtrans/Xtransutil.c
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@users.noreply.github.com>2015-04-16 18:30:39 -0400
committerMike DePaulo <mikedep333@users.noreply.github.com>2015-04-16 18:30:39 -0400
commit8b1577599271da1ac50ebb38d7297769f6b1139c (patch)
tree7ece6e6befb03e6818f65687209df98cdb17307a /nx-X11/lib/xtrans/Xtransutil.c
parent0d9217127f3e81fa19037f4923949b10443c5f1d (diff)
parentac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1 (diff)
downloadnx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.tar.gz
nx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.tar.bz2
nx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.zip
Merge pull request #12 from sunweaver/pr/arch-cleanup.CRAY
arch cleanup (CRAY/WORD64) + X.Org CVE-2013-7439
Diffstat (limited to 'nx-X11/lib/xtrans/Xtransutil.c')
-rw-r--r--nx-X11/lib/xtrans/Xtransutil.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/nx-X11/lib/xtrans/Xtransutil.c b/nx-X11/lib/xtrans/Xtransutil.c
index 253e8b099..729e65caa 100644
--- a/nx-X11/lib/xtrans/Xtransutil.c
+++ b/nx-X11/lib/xtrans/Xtransutil.c
@@ -104,17 +104,8 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
*/
struct sockaddr_in saddr;
-#ifdef CRAY
-#ifdef OLDTCP
- int len = sizeof(saddr.sin_addr);
-#else
- int len = SIZEOF_in_addr;
-#endif /* OLDTCP */
- char *cp = (char *) &saddr.sin_addr;
-#else /* else not CRAY */
int len = sizeof(saddr.sin_addr.s_addr);
char *cp = (char *) &saddr.sin_addr.s_addr;
-#endif /* CRAY */
memcpy (&saddr, *addrp, sizeof (struct sockaddr_in));