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/include/extensions/XKBstr.h | |
| 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/include/extensions/XKBstr.h')
| -rw-r--r-- | nx-X11/include/extensions/XKBstr.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/include/extensions/XKBstr.h b/nx-X11/include/extensions/XKBstr.h index bc63f4923..6131c931c 100644 --- a/nx-X11/include/extensions/XKBstr.h +++ b/nx-X11/include/extensions/XKBstr.h @@ -33,12 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XkbCharToInt(v) ((v)&0x80?(int)((v)|(~0xff)):(int)((v)&0x7f)) #define XkbIntTo2Chars(i,h,l) (((h)=((i>>8)&0xff)),((l)=((i)&0xff))) -#if defined(WORD64) && defined(UNSIGNEDBITFIELDS) -#define Xkb2CharsToInt(h,l) ((h)&0x80?(int)(((h)<<8)|(l)|(~0xffff)):\ - (int)(((h)<<8)|(l)&0x7fff)) -#else #define Xkb2CharsToInt(h,l) ((short)(((h)<<8)|(l))) -#endif /* * Common data structures and access macros |