diff options
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/info/info.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/info/memory.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/configure.in.in | 1 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/tdefontinst/GetPid.c | 5 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/tdefontinst/XConfig.cpp | 2 |
5 files changed, 3 insertions, 9 deletions
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 4539e6dd1..2ca117920 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -464,8 +464,6 @@ static int GetInfo_ReadfromPipe( TQListView *lBox, const char *FileName, bool Wi #ifdef __linux__ #include "info_linux.cpp" -#elif defined(sgi) && sgi -#include "info_sgi.cpp" #elif defined(__FreeBSD__) || defined (__DragonFly__) #include "info_fbsd.cpp" #elif __NetBSD__ diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 950062b2a..593e332a8 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -449,8 +449,6 @@ void KMemoryWidget::update_Values() #include "memory_linux.cpp" #elif defined(__APPLE__) #include "memory_osx.cpp" -#elif defined(sgi) && sgi -#include "memory_sgi.cpp" #elif defined(__svr4__) && defined(sun) #include "memory_solaris.cpp" #elif defined(__FreeBSD__) || defined(__DragonFly__) diff --git a/kcontrol/tdefontinst/configure.in.in b/kcontrol/tdefontinst/configure.in.in index c0e617fe3..d11ab77df 100644 --- a/kcontrol/tdefontinst/configure.in.in +++ b/kcontrol/tdefontinst/configure.in.in @@ -91,7 +91,6 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then *-*-kfreebsd-gnu*) UNAME='GNU/kFreeBSD' ;; *-*-netbsd*) UNAME='NetBSD' ;; *-*-solaris*) UNAME='Solaris' ;; - *-*-irix*) UNAME='Irix' ;; *-*-aix*) UNAME='AIX' ;; *-*-darwin*) UNAME='Darwin' ;; *) UNAME='Unknown' ;; diff --git a/kcontrol/tdefontinst/tdefontinst/GetPid.c b/kcontrol/tdefontinst/tdefontinst/GetPid.c index 11e2cf048..a73532d26 100644 --- a/kcontrol/tdefontinst/tdefontinst/GetPid.c +++ b/kcontrol/tdefontinst/tdefontinst/GetPid.c @@ -60,7 +60,6 @@ FreeBSD Tested on FreeBSD 5.1 by Brian Ledbetter <brian@shadowcom.net> NetBSD OpenBSD - Irix Solaris Tested on Solaris 8 x86 by Torsten Kasch <tk@Genetik.Uni-Bielefeld.DE> AIX ...else parse output of "ps -eaf" @@ -75,7 +74,7 @@ gcc GetPid.c -DTEST_GETPID -DOS_Linux -o tst - ...replace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Irix, OS_Solaris, + ...replace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Solaris, or OS_AIX 2. Start a program - such as "vi" @@ -256,7 +255,7 @@ unsigned int kfi_getPid(const char *proc, unsigned int ppid) return error ? 0 : pid; } -#elif defined OS_Irix || defined OS_Solaris +#elif defined OS_Solaris #include <unistd.h> #include <errno.h> diff --git a/kcontrol/tdefontinst/tdefontinst/XConfig.cpp b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp index bb6e49d5e..c373667bd 100644 --- a/kcontrol/tdefontinst/tdefontinst/XConfig.cpp +++ b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp @@ -39,7 +39,7 @@ #include <sys/types.h> #include <signal.h> -#if defined OS_Irix || defined OS_Solaris +#if defined OS_Solaris extern "C" unsigned int kfi_getPid(const char *proc, pid_t ppid); #else extern "C" unsigned int kfi_getPid(const char *proc, unsigned int ppid); |