summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt1
-rw-r--r--config.h.cmake16
-rw-r--r--dcop/KDE-ICE/Xtransint.h4
-rw-r--r--dcop/KDE-ICE/Xtranssock.c3
-rw-r--r--kate/data/rpmspec.xml4
-rw-r--r--kjs/string_object.cpp3
-rw-r--r--tdecore/kglobalaccel_x11.cpp3
-rw-r--r--tdecore/kmountpoint.cpp5
-rw-r--r--tdecore/kpty.cpp11
-rw-r--r--tdecore/tdeprocess.cpp5
-rw-r--r--tdefile-plugins/elf/tdefile_elf.cpp5
-rw-r--r--tdehtml/rendering/render_arena.cpp4
-rw-r--r--tdeio/tdeio/configure.in.in14
-rw-r--r--tdeio/tdeio/global.cpp4
-rw-r--r--tdeio/tdeio/kurlcompletion.cpp3
-rw-r--r--tdesu/tdesu_pty.cpp2
-rw-r--r--tdeui/kpixmapio.cpp3
-rw-r--r--tdewallet/backend/blowfish.h3
-rw-r--r--tdewallet/backend/sha1.cpp6
19 files changed, 8 insertions, 91 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d98b3611a..2d6f11106 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,7 +253,6 @@ check_include_file( "strings.h" HAVE_STRINGS_H )
check_include_file( "string.h" HAVE_STRING_H )
check_include_file( "sysent.h" HAVE_SYSENT_H )
check_include_file( "sys/acl.h" HAVE_SYS_ACL_H )
-check_include_file( "sys/bitypes.h" HAVE_SYS_BITYPES_H )
check_include_file( "sys/dir.h" HAVE_SYS_DIR_H )
check_include_file( "sys/filio.h" HAVE_SYS_FILIO_H )
check_include_file( "sys/mman.h" HAVE_SYS_MMAN_H )
diff --git a/config.h.cmake b/config.h.cmake
index fa6580cf3..2f29ba382 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -600,9 +600,6 @@
/* Define to 1 if you have the <sys/asoundlib.h> header file. */
#cmakedefine HAVE_SYS_ASOUNDLIB_H 1
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#cmakedefine HAVE_SYS_BITYPES_H 1
-
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */
#cmakedefine HAVE_SYS_DIR_H 1
@@ -958,19 +955,6 @@
-#ifdef __osf__
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <sys/mount.h>
-int getmntinfo(struct statfs **mntbufp, int flags);
-#include <sys/fs_types.h> /* for mnt_names[] */
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
/* Define if you need to use the GNU extensions */
#cmakedefine _GNU_SOURCE 1
diff --git a/dcop/KDE-ICE/Xtransint.h b/dcop/KDE-ICE/Xtransint.h
index 3678e48bf..20c003387 100644
--- a/dcop/KDE-ICE/Xtransint.h
+++ b/dcop/KDE-ICE/Xtransint.h
@@ -139,9 +139,6 @@ extern int errno; /* Internal system error number. */
#else
#include <sys/param.h>
#ifndef OPEN_MAX
-#if defined(__OSF1__) || defined(__osf__)
-#define OPEN_MAX 256
-#else
#ifdef NOFILE
#define OPEN_MAX NOFILE
#else
@@ -154,7 +151,6 @@ extern int errno; /* Internal system error number. */
#endif
#endif
#endif
-#endif
#ifdef __GNU__
#define TRANS_OPEN_MAX OPEN_MAX
#else /* !__GNU__ */
diff --git a/dcop/KDE-ICE/Xtranssock.c b/dcop/KDE-ICE/Xtranssock.c
index 31a35fcd9..9d2c39456 100644
--- a/dcop/KDE-ICE/Xtranssock.c
+++ b/dcop/KDE-ICE/Xtranssock.c
@@ -88,9 +88,6 @@ from The Open Group.
#endif /* SYSV */
#endif /* MOTOROLA */
#ifndef NO_TCP_H
-#ifdef __osf__
-#include <sys/param.h>
-#endif /* osf */
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
#include <machine/endian.h>
#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */
diff --git a/kate/data/rpmspec.xml b/kate/data/rpmspec.xml
index 3ae4eb9d5..ef503330b 100644
--- a/kate/data/rpmspec.xml
+++ b/kate/data/rpmspec.xml
@@ -2,8 +2,8 @@
<!DOCTYPE language SYSTEM "language.dtd" [
<!ENTITY a_valid_char_in_macro_names "A-Za-z0-9_">
<!ENTITY command_section_name "(prep|build|pre|preun|install|post|postun|clean|files|trigger|triggerin|triggerun|triggerpostun|verifyscript|check|pretrans|posttrans)">
- <!ENTITY arch "(aarch64|alpha|alphaev5|alphaev56|alphaev6|alphaev67|alphapca56|amd64|armv3l|armv4b|armv4l|armv4tl|armv5b|armv5l|armv5teb|armv5tejl|armv5tel|armv6l|armv7l|atariclone|atarist|atariste|ataritt|athlon|axp|em64t|falcon|fat|geode|hades|hppa|hppa1\.0|hppa1\.1|hppa1\.2|hppa2\.0|hppa64|i370|i386|i486|i586|i686|ia32e|ia64|IP|m68k|m68kmint|milan|mips|mipsel|noarch|osfmach3_i386|osfmach3_i486|osfmach3_i586|osfmach3_i686|osfmach3_ppc|parisc|pentium3|pentium4|powerpc|powerpc64|powerppc|ppc|ppc32dy4|ppc64|ppc64le|ppc64iseries|ppc64pseries|ppc8260|ppc8560|ppciseries|ppcpseries|rs6000|s390|s390x|sgi|sh|sh3|sh4|sh4a|sparc|sparc64|sparc64v|sparcv8|sparcv9|sparcv9v|sun4|sun4c|sun4d|sun4m|sun4u|x86_64|xtensa)">
- <!ENTITY os "(AIX|AmigaOS|BSD_OS|bsdi|bsdi4\.0|cygwin32|CYGWIN32_95|CYGWIN32_NT|Darwin|darwin|Darwin|FreeBSD|FreeMiNT|HP-UX|hpux10|hpux10\.00|hpux10\.01|hpux10\.10|hpux10\.20|hpux10\.30|hpux11\.00|hpux9\.04|hpux9\.05|hpux9\.07|IRIX|Irix|IRIX|IRIX64|Irix64|IRIX64|Linux|Linux\/390|Linux\/ESA|machten|MacOSX|macosx|MacOSX|MiNT|mint|MiNT|mint|MiNT|mint|MP_RAS|ncr-sysv4\.2|ncr-sysv4\.3|NEXTSTEP|NextStep|OS\/390|OSF1|osf1|osf3\.2|osf4\.0|SCO_SV|SCO_SV3\.2v5\.0\.2|solaris|solaris2\.3|solaris2\.4|solaris2\.5|solaris2\.6|solaris2\.7|SunOS|SunOS4|SunOS5|TOS|UNIX_SV|VM\/ESA)">
+ <!ENTITY arch "(aarch64|alpha|alphaev5|alphaev56|alphaev6|alphaev67|alphapca56|amd64|armv3l|armv4b|armv4l|armv4tl|armv5b|armv5l|armv5teb|armv5tejl|armv5tel|armv6l|armv7l|atariclone|atarist|atariste|ataritt|athlon|axp|em64t|falcon|fat|geode|hades|hppa|hppa1\.0|hppa1\.1|hppa1\.2|hppa2\.0|hppa64|i370|i386|i486|i586|i686|ia32e|ia64|IP|m68k|m68kmint|milan|mips|mipsel|noarch|parisc|pentium3|pentium4|powerpc|powerpc64|powerppc|ppc|ppc32dy4|ppc64|ppc64le|ppc64iseries|ppc64pseries|ppc8260|ppc8560|ppciseries|ppcpseries|rs6000|s390|s390x|sgi|sh|sh3|sh4|sh4a|sparc|sparc64|sparc64v|sparcv8|sparcv9|sparcv9v|sun4|sun4c|sun4d|sun4m|sun4u|x86_64|xtensa)">
+ <!ENTITY os "(AIX|AmigaOS|BSD_OS|bsdi|bsdi4\.0|cygwin32|CYGWIN32_95|CYGWIN32_NT|Darwin|darwin|Darwin|FreeBSD|FreeMiNT|HP-UX|hpux10|hpux10\.00|hpux10\.01|hpux10\.10|hpux10\.20|hpux10\.30|hpux11\.00|hpux9\.04|hpux9\.05|hpux9\.07|IRIX|Irix|IRIX|IRIX64|Irix64|IRIX64|Linux|Linux\/390|Linux\/ESA|machten|MacOSX|macosx|MacOSX|MiNT|mint|MiNT|mint|MiNT|mint|MP_RAS|ncr-sysv4\.2|ncr-sysv4\.3|NEXTSTEP|NextStep|OS\/390|SCO_SV|SCO_SV3\.2v5\.0\.2|solaris|solaris2\.3|solaris2\.4|solaris2\.5|solaris2\.6|solaris2\.7|SunOS|SunOS4|SunOS5|TOS|UNIX_SV|VM\/ESA)">
<!ENTITY arch_conditionals_names "(ifarch|ifnarch)">
<!ENTITY os_conditionals_names "(ifos|ifnos)">
<!ENTITY lookahead_whitespace_eol "(?=($| |\t))">
diff --git a/kjs/string_object.cpp b/kjs/string_object.cpp
index b9321e70f..304a4ba34 100644
--- a/kjs/string_object.cpp
+++ b/kjs/string_object.cpp
@@ -37,9 +37,6 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-#endif
using namespace KJS;
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
diff --git a/tdefile-plugins/elf/tdefile_elf.cpp b/tdefile-plugins/elf/tdefile_elf.cpp
index 8fc8df451..0a344313b 100644
--- a/tdefile-plugins/elf/tdefile_elf.cpp
+++ b/tdefile-plugins/elf/tdefile_elf.cpp
@@ -34,12 +34,7 @@
#include "tdelficon.h"
-#if !defined(__osf__)
#include <inttypes.h>
-#else
-typedef unsigned long uint32_t;
-typedef unsigned short uint16_t;
-#endif
typedef KGenericFactory<KElfPlugin> ElfFactory;
diff --git a/tdehtml/rendering/render_arena.cpp b/tdehtml/rendering/render_arena.cpp
index d3fe1676e..cd879599b 100644
--- a/tdehtml/rendering/render_arena.cpp
+++ b/tdehtml/rendering/render_arena.cpp
@@ -88,7 +88,7 @@ void* RenderArena::allocate(size_t size)
#else
void* result = 0;
- // Ensure we have correct alignment for pointers. Important for Tru64
+ // Ensure we have correct alignment for pointers
size = TDEHTML_ROUNDUP(size, sizeof(void*));
// Check recyclers first
@@ -130,7 +130,7 @@ void RenderArena::free(size_t size, void* ptr)
VALGRIND_MEMPOOL_FREE(findContainingArena(&m_pool, ptr)->base, ptr);
#endif
- // Ensure we have correct alignment for pointers. Important for Tru64
+ // Ensure we have correct alignment for pointers
size = TDEHTML_ROUNDUP(size, sizeof(void*));
// See if it's a size that we recycle
diff --git a/tdeio/tdeio/configure.in.in b/tdeio/tdeio/configure.in.in
index f45411458..cf9911512 100644
--- a/tdeio/tdeio/configure.in.in
+++ b/tdeio/tdeio/configure.in.in
@@ -32,20 +32,6 @@ AC_FIND_ZLIB
AC_CHECK_HEADERS(sys/mnttab.h sys/mntent.h mntent.h fstab.h sys/ucred.h sys/mount.h)
AC_CHECK_FUNCS(setmntent getmntinfo)
-AH_VERBATIM(_GETMNTINFO, [
-#ifdef __osf__
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <sys/mount.h>
-int getmntinfo(struct statfs **mntbufp, int flags);
-#include <sys/fs_types.h> /* for mnt_names[] */
-#ifdef __cplusplus
-}
-#endif
-#endif
-])
-
dnl ------------------------------------------------------------------------
dnl Try to find if libvolmgt is installed (Solaris)
dnl ------------------------------------------------------------------------
diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp
index be6e6d89a..f026b3044 100644
--- a/tdeio/tdeio/global.cpp
+++ b/tdeio/tdeio/global.cpp
@@ -1760,11 +1760,7 @@ static TQString get_mount_info(const TQString& filename,
if (realpath(device_name, realpath_buffer) != 0)
// succes, use result from realpath
device_name = realpath_buffer;
-#ifdef __osf__
- char * mounttype = mnt_names[mounted[i].f_type];
-#else
char * mounttype = mounted[i].f_fstypename;
-#endif
if ( is_my_mountpoint( mounted[i].f_mntonname, realname, max ) )
{
mountPoint = TQFile::decodeName(mounted[i].f_mntonname);
diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index 1bbac7cfe..7c79d48f3 100644
--- a/tdeio/tdeio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -223,8 +223,7 @@ void DirectoryListThread::run()
// Loop through all directory entries
// Solaris and IRIX dirent structures do not allocate space for d_name. On
- // systems that do (HP-UX, Linux, Tru64 UNIX), we overallocate space but
- // that's ok.
+ // systems that do (HP-UX, Linux), we overallocate space but that's ok.
#ifndef HAVE_READDIR_R
struct dirent *dirEntry = 0;
while ( !terminationRequested() &&
diff --git a/tdesu/tdesu_pty.cpp b/tdesu/tdesu_pty.cpp
index 4736ac1eb..8559512af 100644
--- a/tdesu/tdesu_pty.cpp
+++ b/tdesu/tdesu_pty.cpp
@@ -33,7 +33,7 @@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/ioctl.h>
-#if defined(__osf__) || defined(__CYGWIN__)
+#if defined(__CYGWIN__)
#include <pty.h>
#endif
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index 74d3c64b1..46c0e2aff 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -35,9 +35,6 @@
#ifdef HAVE_MITSHM
#include <X11/extensions/XShm.h>
#endif
-#ifdef __osf__
-extern "C" int XShmQueryExtension(Display *display);
-#endif
#else
#undef HAVE_MITSHM
#endif
diff --git a/tdewallet/backend/blowfish.h b/tdewallet/backend/blowfish.h
index 581ac31c0..33c0c6ee1 100644
--- a/tdewallet/backend/blowfish.h
+++ b/tdewallet/backend/blowfish.h
@@ -28,9 +28,6 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-#endif
#include "blockcipher.h"
diff --git a/tdewallet/backend/sha1.cpp b/tdewallet/backend/sha1.cpp
index 7420b5f16..c2bb4339b 100644
--- a/tdewallet/backend/sha1.cpp
+++ b/tdewallet/backend/sha1.cpp
@@ -24,12 +24,6 @@
#include <sys/types.h>
#endif
#ifdef HAVE_STDINT_H
-#include <stdint.h> /* For uintXX_t on OSX */
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-#endif
-#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-09 03:06:58 +0000