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/config | |
| 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/config')
| -rw-r--r-- | nx-X11/config/cf/Imake.cf | 11 | ||||
| -rw-r--r-- | nx-X11/config/imake/imakemdep.h | 20 | ||||
| -rw-r--r-- | nx-X11/config/makedepend/main.c | 2 |
3 files changed, 2 insertions, 31 deletions
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 16b79c834..76e4664aa 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -520,17 +520,6 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # define MacIIArchitecture #endif /* macII */ -#ifdef _CRAY -# define MacroIncludeFile <cray.cf> -# define MacroFile cray.cf -# undef cray -# undef CRAY -# undef CRAY1 -# undef CRAY2 -# undef YMP -# define CrayArchitecture -#endif /* _CRAY */ - #ifdef sgi # define MacroIncludeFile <sgi.cf> # define MacroFile sgi.cf diff --git a/nx-X11/config/imake/imakemdep.h b/nx-X11/config/imake/imakemdep.h index bacc3af54..469454114 100644 --- a/nx-X11/config/imake/imakemdep.h +++ b/nx-X11/config/imake/imakemdep.h @@ -112,9 +112,6 @@ in this Software without prior written authorization from The Open Group. #endif #endif #endif -#ifdef _CRAY -#define imake_ccflags "-DSYSV -DUSG" -#endif #if defined(_IBMR2) || defined(aix) #define imake_ccflags "-Daix -DSYSV" @@ -225,7 +222,7 @@ in this Software without prior written authorization from The Open Group. * descriptor onto another, define such a mechanism here (if you don't * already fall under the existing category(ies). */ -#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) && !defined(__SCO__) +#if defined(SYSV) && !defined(Mips) && !defined(_SEQUENT_) && !defined(__SCO__) #define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \ fcntl(fd1, F_DUPFD, fd2))) #endif @@ -309,9 +306,6 @@ in this Software without prior written authorization from The Open Group. #ifdef __sxg__ #define DEFAULT_CPP "/usr/lib/cpp" #endif -#ifdef _CRAY -#define DEFAULT_CPP "/lib/pcpp" -#endif #if defined(__386BSD__) #define DEFAULT_CPP "/usr/libexec/cpp" #endif @@ -497,9 +491,6 @@ char *cpp_argv[ARGUMENTS] = { "-Duniosu", #endif #endif /* luna */ -#ifdef _CRAY /* Cray */ - "-Ucray", -#endif #ifdef Mips "-DMips", /* Define and use Mips for Mips Co. OS/mach. */ # if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43) @@ -1098,15 +1089,6 @@ struct symtab predefs[] = { #ifdef VMS {"VMS", "1"}, #endif -#ifdef cray - {"cray", "1"}, -#endif -#ifdef CRAY - {"CRAY", "1"}, -#endif -#ifdef _CRAY - {"_CRAY", "1"}, -#endif #ifdef att {"att", "1"}, #endif diff --git a/nx-X11/config/makedepend/main.c b/nx-X11/config/makedepend/main.c index d413964a0..94fed0518 100644 --- a/nx-X11/config/makedepend/main.c +++ b/nx-X11/config/makedepend/main.c @@ -746,7 +746,7 @@ char *base_name(char *file) # define NEED_RENAME # endif #else /* Imake configured, check known OS'es without rename() */ -# if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(__UNIXOS2__) && !defined(clipper) && !defined(__clipper__) +# if defined(USG) && !defined(SVR4) && !defined(__UNIXOS2__) && !defined(clipper) && !defined(__clipper__) # define NEED_RENAME # endif #endif |