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/Xos.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/Xos.h')
| -rw-r--r-- | nx-X11/include/Xos.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h index 99cb3bef4..04b14b6fc 100644 --- a/nx-X11/include/Xos.h +++ b/nx-X11/include/Xos.h @@ -45,9 +45,6 @@ in this Software without prior written authorization from The Open Group. #ifdef USG #ifndef __TYPES__ -#ifdef CRAY -#define word word_t -#endif /* CRAY */ #include <sys/types.h> /* forgot to protect it... */ #define __TYPES__ #endif /* __TYPES__ */ @@ -149,7 +146,7 @@ extern int sys_nerr; */ #if defined(X_NOT_POSIX) #include <fcntl.h> -#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__) +#if defined(USL) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__) #include <unistd.h> #endif #ifdef WIN32 @@ -179,10 +176,7 @@ extern int sys_nerr; #include <sys/time.h> #endif #include <time.h> -#ifdef CRAY -#undef word -#endif /* CRAY */ -#if defined(USG) && !defined(CRAY) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__) && !defined(clipper) && !defined(__clipper__) +#if defined(USG) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__) && !defined(clipper) && !defined(__clipper__) struct timeval { long tv_sec; long tv_usec; |