diff options
| author | Mike DePaulo <mikedep333@users.noreply.github.com> | 2015-04-16 18:30:39 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@users.noreply.github.com> | 2015-04-16 18:30:39 -0400 |
| commit | 8b1577599271da1ac50ebb38d7297769f6b1139c (patch) | |
| tree | 7ece6e6befb03e6818f65687209df98cdb17307a /nx-X11/lib/Xtst/XRecord.c | |
| parent | 0d9217127f3e81fa19037f4923949b10443c5f1d (diff) | |
| parent | ac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1 (diff) | |
| download | nx-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/Xtst/XRecord.c')
| -rw-r--r-- | nx-X11/lib/Xtst/XRecord.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/nx-X11/lib/Xtst/XRecord.c b/nx-X11/lib/Xtst/XRecord.c index 16eaeffd7..05cbda889 100644 --- a/nx-X11/lib/Xtst/XRecord.c +++ b/nx-X11/lib/Xtst/XRecord.c @@ -672,8 +672,6 @@ XRecordFreeData(data) /* the EXTRACT macros are adapted from ICElibint.h */ -#ifndef WORD64 - #define EXTRACT_CARD16(swap, src, dst) \ { \ (dst) = *((CARD16 *) (src)); \ @@ -688,32 +686,6 @@ XRecordFreeData(data) (dst) = lswapl (dst); \ } -#else /* WORD64 */ - -#define EXTRACT_CARD16(swap, src, dst) \ -{ \ - (dst) = *((src) + 0); \ - (dst) <<= 8; \ - (dst) |= *((src) + 1); \ - if (swap) \ - (dst) = lswaps (dst); \ -} - -#define EXTRACT_CARD32(swap, src, dst) \ -{ \ - (dst) = *((src) + 0); \ - (dst) <<= 8; \ - (dst) |= *((src) + 1); \ - (dst) <<= 8; \ - (dst) |= *((src) + 2); \ - (dst) <<= 8; \ - (dst) |= *((src) + 3); \ - if (swap) \ - (dst) = lswapl (dst); \ -} - -#endif /* WORD64 */ - /* byte swapping macros from xfs/include/misc.h */ /* byte swap a long literal */ |