TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove support for Tru64 and OSF

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/334/head
Michele Calgaro 2 months ago
parent e9b2881ed7
commit 1df8095821
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
19 changed files with 8 additions and 91 deletions
Show Stats Download Patch File Download Diff File

1
CMakeLists.txt
Unescape Escape View File

@ -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 )

16
config.h.cmake
Unescape Escape View File

@ -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

4
dcop/KDE-ICE/Xtransint.h
Unescape Escape View File

@ -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__ */

3
dcop/KDE-ICE/Xtranssock.c
Unescape Escape View File

@ -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__ */

4
kate/data/rpmspec.xml
Unescape Escape View File

@ -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))">

3
kjs/string_object.cpp
Unescape Escape View File

@ -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;

3
tdecore/kglobalaccel_x11.cpp
Unescape Escape View File

@ -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;
}

5
tdecore/kmountpoint.cpp
Unescape Escape View File

@ -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)
{

11
tdecore/kpty.cpp
Unescape Escape View File

@ -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)

5
tdecore/tdeprocess.cpp
Unescape Escape View File

@ -32,11 +32,6 @@
#define __svr4__
#endif
#ifdef __osf__
#define _OSF_SOURCE
#include <float.h>
#endif
#ifdef _AIX
#define _ALL_SOURCE
#endif

5
tdefile-plugins/elf/tdefile_elf.cpp
Unescape Escape View File

@ -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;

4
tdehtml/rendering/render_arena.cpp
Unescape Escape View File

@ -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

14
tdeio/tdeio/configure.in.in
Unescape Escape View File

@ -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 ------------------------------------------------------------------------

4
tdeio/tdeio/global.cpp
Unescape Escape View File

@ -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);

3
tdeio/tdeio/kurlcompletion.cpp
Unescape Escape View File

@ -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() &&

2
tdesu/tdesu_pty.cpp
Unescape Escape View File

@ -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

3
tdeui/kpixmapio.cpp
Unescape Escape View File

@ -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

3
tdewallet/backend/blowfish.h
Unescape Escape View File

@ -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"

6
tdewallet/backend/sha1.cpp
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save