diff options
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/kglobalaccel_x11.cpp | 3 | ||||
| -rw-r--r-- | tdecore/kmountpoint.cpp | 5 | ||||
| -rw-r--r-- | tdecore/kpty.cpp | 11 | ||||
| -rw-r--r-- | tdecore/tdeprocess.cpp | 5 |
4 files changed, 2 insertions, 22 deletions
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index 41e58b959..91cc94b74 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -187,12 +187,9 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE return false; } -#ifndef __osf__ -// this crashes under Tru64 so ..... kdDebug(125) << TQString(TQString( "grabKey( key: '%1', bGrab: %2 ): keyCodeX: %3 keyModX: %4\n" ) .arg( key.key().toStringInternal() ).arg( bGrab ) .arg( keyCodeX, 0, 16 ).arg( keyModX, 0, 16 )); -#endif if( !keyCodeX ) { return false; } diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp index e78fc7335..0828911ef 100644 --- a/tdecore/kmountpoint.cpp +++ b/tdecore/kmountpoint.cpp @@ -240,12 +240,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded) KMountPoint *mp = new KMountPoint(); mp->m_mountedFrom = TQFile::decodeName(mounted[i].f_mntfromname); mp->m_mountPoint = TQFile::decodeName(mounted[i].f_mntonname); - -#ifdef __osf__ - mp->m_mountType = TQFile::decodeName(mnt_names[mounted[i].f_type]); -#else mp->m_mountType = TQFile::decodeName(mounted[i].f_fstypename); -#endif if (infoNeeded & NeedMountOptions) { diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp index a66705f4d..86f5bfefa 100644 --- a/tdecore/kpty.cpp +++ b/tdecore/kpty.cpp @@ -30,11 +30,6 @@ #define __svr4__ #endif -#ifdef __osf__ -#define _OSF_SOURCE -#include <float.h> -#endif - #ifdef _AIX #define _ALL_SOURCE #endif @@ -91,11 +86,9 @@ extern "C" { } #endif -#if !defined(__osf__) -# ifdef HAVE_TERMIO_H +#ifdef HAVE_TERMIO_H /* needed at least on AIX */ -# include <termio.h> -# endif +# include <termio.h> #endif #if defined(HAVE_TCGETATTR) diff --git a/tdecore/tdeprocess.cpp b/tdecore/tdeprocess.cpp index d3add5843..e60f30118 100644 --- a/tdecore/tdeprocess.cpp +++ b/tdecore/tdeprocess.cpp @@ -32,11 +32,6 @@ #define __svr4__ #endif -#ifdef __osf__ -#define _OSF_SOURCE -#include <float.h> -#endif - #ifdef _AIX #define _ALL_SOURCE #endif |