diff options
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | tdecore/kpty.cpp | 6 | ||||
| -rw-r--r-- | tdecore/tdeprocess.cpp | 4 | ||||
| -rw-r--r-- | tdeprint/fooparser.cpp | 2 |
4 files changed, 2 insertions, 13 deletions
diff --git a/config.h.cmake b/config.h.cmake index 7aaf0a23f..1893d8ce3 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -499,9 +499,6 @@ /* Define to 1 if you have the `setpriority' function. */ #cmakedefine HAVE_SETPRIORITY 1 -/* Define if you have a STL implementation by SGI */ -#undef HAVE_SGI_STL - /* Define if you have the shl_load function. */ #undef HAVE_SHL_LOAD diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp index cb3cc6b9a..76a84585c 100644 --- a/tdecore/kpty.cpp +++ b/tdecore/kpty.cpp @@ -26,10 +26,6 @@ #include "kpty.h" #include "tdeprocess.h" -#ifdef __sgi -#define __svr4__ -#endif - #ifdef _AIX #define _ALL_SOURCE #endif @@ -259,7 +255,7 @@ bool KPty::_attachPty(int pty_master) #endif } -#if (defined(__svr4__) || defined(__sgi__)) +#if defined(__svr4__) // Solaris ioctl(d->slaveFd, I_PUSH, "ptem"); ioctl(d->slaveFd, I_PUSH, "ldterm"); diff --git a/tdecore/tdeprocess.cpp b/tdecore/tdeprocess.cpp index 185bd5a6f..360fca350 100644 --- a/tdecore/tdeprocess.cpp +++ b/tdecore/tdeprocess.cpp @@ -28,10 +28,6 @@ #include <config.h> -#ifdef __sgi -#define __svr4__ -#endif - #ifdef _AIX #define _ALL_SOURCE #endif diff --git a/tdeprint/fooparser.cpp b/tdeprint/fooparser.cpp index 23dd22dd2..91cf391f7 100644 --- a/tdeprint/fooparser.cpp +++ b/tdeprint/fooparser.cpp @@ -220,7 +220,7 @@ static const short yycheck[] = { 4, #define YYSTACK_USE_ALLOCA #define alloca __builtin_alloca #else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || (defined (__sun) && defined (__i386)) #define YYSTACK_USE_ALLOCA #include <alloca.h> #else /* not sparc */ |