X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fconfig%2Fimake%2Fimakemdep.h;h=bad190de04a590623d199d595acf2b65f61bc1ed;hb=904a48b8229911fd59f4dbc98b010ed2380c319f;hp=8a27ad030621f87442cc6f82904e905fb4989933;hpb=07900bd93b96be348da33cd29c7d5ec42f72732e;p=oweals%2Fcde.git

diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h
index 8a27ad03..bad190de 100644
--- a/cde/config/imake/imakemdep.h
+++ b/cde/config/imake/imakemdep.h
@@ -65,10 +65,6 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif
 
-#if defined(macII) || defined(_AUX_SOURCE)
-#define imake_ccflags "-DmacII -DSYSV"
-#endif
-
 #ifdef stellar
 #define imake_ccflags "-DSYSV"
 #endif
@@ -136,10 +132,6 @@ in this Software without prior written authorization from The Open Group.
 #define imake_ccflags "-fn -tm c1"
 #endif
 
-#ifdef apollo
-#define imake_ccflags "-DX_NOT_POSIX"
-#endif
-
 #ifdef WIN32
 #if _MSC_VER < 1000
 #define imake_ccflags "-nologo -batch -D__STDC__"
@@ -237,9 +229,6 @@ in this Software without prior written authorization from The Open Group.
 #define USE_CC_E
 #define DEFAULT_CC "cl"
 #endif
-#ifdef apollo
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
 #if defined(_IBMR2) && !defined(DEFAULT_CPP)
 #define DEFAULT_CPP "/usr/ccs/lib/cpp"
 #endif
@@ -300,7 +289,7 @@ char *cpp_argv[ARGUMENTS] = {
 #ifdef unix
 	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
 #endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(ISC) || defined(linux) || defined(__hpux__) || defined(__vxworks)
+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(ISC) || defined(__linux__) || defined(__hpux__) || defined(__vxworks)
 # ifdef __i386__
 	"-D__i386__",
 # endif
@@ -354,9 +343,6 @@ char *cpp_argv[ARGUMENTS] = {
 #ifdef M4310
 	"-DM4310",	/* Tektronix */
 #endif
-#if defined(macII) || defined(_AUX_SOURCE)
-	"-DmacII",	/* Apple A/UX */
-#endif
 #ifdef sony
 	"-Dsony",	/* Sony */
 #if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42
@@ -481,21 +467,6 @@ char *cpp_argv[ARGUMENTS] = {
 #  endif
 # endif
 #endif
-#ifdef __osf__
-	"-D__osf__",
-# ifdef __mips__
-	"-D__mips__",
-# endif
-# ifdef __alpha
-	"-D__alpha",
-# endif
-# ifdef __i386__
-	"-D__i386__",
-# endif
-# ifdef __GNUC__
-	"-traditional",
-# endif
-#endif
 #ifdef Oki
 	"-DOki",
 #endif
@@ -517,7 +488,7 @@ char *cpp_argv[ARGUMENTS] = {
 #endif
 #ifdef linux
         "-traditional",
-        "-Dlinux",
+        "-D__linux__",
 #endif
 #ifdef __sxg__
 	"-D__sxg__",
@@ -582,7 +553,7 @@ char *cpp_argv[ARGUMENTS] = {
 # define DEFAULT_OS_MINOR_REV	"r %[0-9]"
 /* No information available to generate default OSTeenyVersion value. */
 # define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(linux) || defined(sony)
+#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__linux__) || defined(sony)
 /* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */
 # define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
 # define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
@@ -594,11 +565,6 @@ char *cpp_argv[ARGUMENTS] = {
 # define DEFAULT_OS_MINOR_REV	"r %*[^.].%*d.%1s"
 # define DEFAULT_OS_TEENY_REV	"r %*[^.].%*d.%*c%[0-9]"
 # define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(__osf__)
-/* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */
-# define DEFAULT_OS_MAJOR_REV	"r %*[^0-9]%[0-9]"
-# define DEFAULT_OS_MINOR_REV	"r %*[^.].%[0-9]"
-# define DEFAULT_OS_NAME	"srvm %[^\n]"
 #elif defined(__FreeBSD__)
 /* uname -r returns "x.y[.z]-mumble", e.g. "9.0-RELEASE" or "11.0-CURRENT" */
 # define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
@@ -631,9 +597,6 @@ char *cpp_argv[ARGUMENTS] = {
 #define DEF_STRINGIFY(_x) DEF_EVALUATE(_x)
 
 struct symtab	predefs[] = {
-#ifdef apollo
-	{"apollo", "1"},
-#endif
 #ifdef ibm032
 	{"ibm032", "1"},
 #endif
@@ -709,7 +672,7 @@ struct symtab	predefs[] = {
 #ifdef mc68020
 	{"mc68020", "1"},
 #endif
-#if defined(__GNUC__) && !defined(linux)
+#if defined(__GNUC__) && !defined(__linux__)
 	{"__GNUC__", DEF_STRINGIFY(__GNUC__)},
 #endif
 #ifdef __GNUC_MINOR__
@@ -772,21 +735,9 @@ struct symtab	predefs[] = {
 	{"_SYSTYPE_SYSV", "1"},
 #endif
 #endif
-#ifdef __OSF__
-	{"__OSF__", "1"},
-#endif
-#ifdef __osf__
-	{"__osf__", "1"},
-#endif
 #ifdef __alpha
 	{"__alpha", "1"},
 #endif
-#ifdef __DECC
-	{"__DECC",  "1"},
-#endif
-#ifdef __decc
-	{"__decc",  "1"},
-#endif
 #ifdef __unix__
 	{"__unix__", "1"},
 #endif