diff options
author | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
commit | ed474047e06f28fe740130f3bb13d3a40f4833a9 (patch) | |
tree | 35a48f61c00ebb1f0579159c25dbbd1bfe812849 /libX11/src/LiHosts.c | |
parent | 3c0e16af61a9e0b6f9edab1d403adfaa85456599 (diff) | |
parent | d4d629b77742e60caac3d120ff40e9f386380af2 (diff) | |
download | vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.gz vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.bz2 vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013
Conflicts:
libX11/src/xkb/XKBGAlloc.c
libX11/src/xkb/XKBMisc.c
Diffstat (limited to 'libX11/src/LiHosts.c')
-rw-r--r-- | libX11/src/LiHosts.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libX11/src/LiHosts.c b/libX11/src/LiHosts.c index 5ae70d5b2..0f5e837d1 100644 --- a/libX11/src/LiHosts.c +++ b/libX11/src/LiHosts.c @@ -111,15 +111,8 @@ XHostAddress *XListHosts ( _XRead (dpy, (char *) buf, nbytes); for (i = 0; i < reply.nHosts; i++) { -#ifdef WORD64 - xHostEntry xhe; - memcpy((char *)&xhe, bp, SIZEOF(xHostEntry)); - op->family = xhe.family; - op->length = xhe.length; -#else op->family = ((xHostEntry *) bp)->family; op->length =((xHostEntry *) bp)->length; -#endif if (op->family == FamilyServerInterpreted) { char *tp = (char *) (bp + SIZEOF(xHostEntry)); char *vp = memchr(tp, 0, op->length); |