summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ConfigureChecks.cmake6
-rw-r--r--config.h.cmake1
-rw-r--r--configure.in.in8
-rw-r--r--doc/konsole/index.docbook2
-rw-r--r--drkonqi/sha1.cpp3
-rw-r--r--kcontrol/colors/widgetcanvas.cpp2
-rw-r--r--kcontrol/info/Makefile.am2
-rw-r--r--kcontrol/info/configure.in.in5
-rw-r--r--kcontrol/info/memory.cpp2
-rw-r--r--kcontrol/info/memory_tru64.cpp83
-rw-r--r--kcontrol/style/kcmstyle.cpp2
-rw-r--r--konsole/README.ports1
-rw-r--r--ksysguard/configure.in.in2
-rw-r--r--ksysguard/ksysguardd/Makefile.am5
-rw-r--r--ksysguard/ksysguardd/modules.h12
-rw-r--r--nsplugins/sdk/jri_md.h11
-rw-r--r--tdm/backend/dm.h4
-rw-r--r--tdm/kfrontend/kconsole.cpp2
18 files changed, 5 insertions, 148 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 8c8d102d4..640849814 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -62,12 +62,6 @@ if( BUILD_TDM OR BUILD_TDEIOSLAVES )
endif( )
-# sys/bitypes.h (drkonqi)
-if( BUILD_DRKONQI )
- check_include_file( sys/bitypes.h HAVE_SYS_BITYPES_H )
-endif( )
-
-
# sys/ioctl.h (tdeioslave/fish, kcontrol/info)
if( BUILD_TDEIOSLAVES OR BUILD_KCONTROL )
check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H )
diff --git a/config.h.cmake b/config.h.cmake
index 405724300..1f5aaac61 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -61,7 +61,6 @@
// drkonqi
#cmakedefine HAVE_STDINT_H 1
-#cmakedefine HAVE_SYS_BITYPES_H
// drkonqi, tdeioslave
#cmakedefine HAVE_SYS_TYPES_H 1
diff --git a/configure.in.in b/configure.in.in
index d2829c886..305760d09 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -218,14 +218,8 @@ dnl itself) is taking more that nine minutes (!). For tdebase only we take
dnl out that test. ([email protected])
m4_define([_AC_CONFIG_UNIQUE], [])dnl
-AH_VERBATIM(_osf_stuff, [
-#if !defined(HAVE_SETEUID)
-#define seteuid(_eu) setresuid(-1, _eu, -1)
-#endif
-])
-
AH_VERBATIM(_broken_xkb, [
-#if defined(__osf__) || defined(__APPLE__)
+#if defined(__APPLE__)
#define AVOID_XKB /* for konsole to avoid XKB and XTEST */
#endif
])
diff --git a/doc/konsole/index.docbook b/doc/konsole/index.docbook
index a11c0dd17..5114a5d36 100644
--- a/doc/konsole/index.docbook
+++ b/doc/konsole/index.docbook
@@ -1437,7 +1437,7 @@ echo $*</programlisting>
<para>Information on building &konsole; on platforms other than &Linux;
is available in the <filename>README.ports</filename> file in the
&konsole; source package. It provides a list of experts for certain
-platforms (Tru64, &Solaris;, OpenBSD) and requests volunteers from other
+platforms (&Solaris;, OpenBSD) and requests volunteers from other
&UNIX; platforms.</para>
<para>For more infomation please visit these websites:</para>
diff --git a/drkonqi/sha1.cpp b/drkonqi/sha1.cpp
index 86dd30a99..c2619d3a6 100644
--- a/drkonqi/sha1.cpp
+++ b/drkonqi/sha1.cpp
@@ -26,9 +26,6 @@
#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
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index d83b821bd..81399b438 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -324,9 +324,7 @@ void WidgetCanvas::drawSampleWidgets()
TQPixmap pm( vertScrollBar->width(), vertScrollBar->height() );
pm.fill( back );
-#ifndef __osf__
TQPainter::redirect( vertScrollBar, &pm );
-#endif
vertScrollBar->repaint();
TQPainter::redirect( vertScrollBar, 0 );
vertScrollBar->hide();
diff --git a/kcontrol/info/Makefile.am b/kcontrol/info/Makefile.am
index 30eb5ebe8..6db9c62b9 100644
--- a/kcontrol/info/Makefile.am
+++ b/kcontrol/info/Makefile.am
@@ -7,7 +7,7 @@ endif
kcm_info_la_SOURCES = main.cpp memory.cpp opengl.cpp
kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO)
-kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB)
+kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB)
METASOURCES = AUTO
AM_CPPFLAGS= $(all_includes) $(GLINC)
diff --git a/kcontrol/info/configure.in.in b/kcontrol/info/configure.in.in
index 9bc6d1c4b..cee8a2deb 100644
--- a/kcontrol/info/configure.in.in
+++ b/kcontrol/info/configure.in.in
@@ -1,11 +1,7 @@
-# libmach for Tru64
# linux/raw.h for Linux
# devinfo.h, libdevinfo for the list of {IRQ,DMA,IOPORTS/MEMRANGES} for FreeBSD
case "$host" in
- *-*-osf*)
- AC_CHECK_LIB(mach, vm_statistics, LIB_TRU64_MACH="-lmach")dnl
- ;;
*-*-linux*)
AC_CHECK_HEADERS(linux/raw.h sys/raw.h)dnl
;;
@@ -14,7 +10,6 @@ case "$host" in
AC_CHECK_LIB(devinfo, devinfo_foreach_rman, LIBDEVINFO="-ldevinfo")
;;
esac
-AC_SUBST(LIB_TRU64_MACH)
AC_HAVE_GL( have_gl=yes, have_gl=no )
AM_CONDITIONAL(COMPILE_GL_INFO, test x$have_gl = xyes)
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 93da5ea20..71e7a1dc8 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -459,8 +459,6 @@ void KMemoryWidget::update_Values()
#include "memory_hpux.cpp"
#elif defined(__NetBSD__) || defined(__OpenBSD__)
#include "memory_netbsd.cpp"
-#elif __osf__
-#include "memory_tru64.cpp"
#else
/* Default for unsupported systems */
diff --git a/kcontrol/info/memory_tru64.cpp b/kcontrol/info/memory_tru64.cpp
deleted file mode 100644
index c3cbb2fae..000000000
--- a/kcontrol/info/memory_tru64.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This is memory_tru64.cpp to retrieve memory information under Tru64/Alpha.
- *
- * Implemented by Tom Leitner, [email protected]
- *
- * WARNING: This module requires linking with -lmach
- *
- * This routine is based on m_decosf1.c from the "top" program written by:
- *
- * AUTHOR: Anthony Baxter, <[email protected]>
- *
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/mbuf.h>
-#include <net/route.h>
-#include <sys/table.h>
-extern "C" {
-#include <mach/mach_traps.h>
-}
-#include <mach/vm_statistics.h>
-
-#define pagetob(size) (MEMORY(1024L) * ((long) (size) << (long) pageshift))
-#define LOG1024 10
-
-extern "C" void vm_statistics(task_t, vm_statistics_data_t*);
-
-void KMemoryWidget::update()
-{
- int pageshift; /* log base 2 of the pagesize */
- int pagesize;
- vm_statistics_data_t vmstats;
- int swap_pages=0,swap_free=0,i;
- struct tbl_swapinfo swbuf;
-
- /* get the page size with "getpagesize" and calculate pageshift from it */
-
- pagesize = getpagesize();
- pageshift = 0;
- while (pagesize > 1) {
- pageshift++;
- pagesize >>= 1;
- }
-
- /* we only need the amount of log(2)1024 for our conversion */
-
- pageshift -= LOG1024;
-
- /* memory information */
- /* this is possibly bogus - we work out total # pages by */
- /* adding up the free, active, inactive, wired down, and */
- /* zero filled. Anyone who knows a better way, TELL ME! */
- /* Change: dont use zero filled. */
-
- (void) ::vm_statistics(::task_self(), &vmstats);
-
- /* thanks DEC for the table() command. No thanks at all for */
- /* omitting the man page for it from OSF/1 1.2, and failing */
- /* to document SWAPINFO in the 1.3 man page. Lets hear it for */
- /* include files. */
-
- i=0;
- while(table(TBL_SWAPINFO,i,&swbuf,1,sizeof(struct tbl_swapinfo))>0) {
- swap_pages += swbuf.size;
- swap_free += swbuf.free;
- i++;
- }
- Memory_Info[TOTAL_MEM] = pagetob((vmstats.free_count +
- vmstats.active_count +
- vmstats.inactive_count +
- vmstats.wire_count));
- Memory_Info[FREE_MEM] = pagetob(vmstats.free_count);
- Memory_Info[SHARED_MEM] = NO_MEMORY_INFO; /* FIXME ?? */
- Memory_Info[BUFFER_MEM] = NO_MEMORY_INFO; /* FIXME ?? */
-#ifdef __GNUC__
-#warning "FIXME: Memory_Info[CACHED_MEM]"
-#endif
- Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; /* cached memory in ram */
- Memory_Info[SWAP_MEM] = pagetob(swap_pages);
- Memory_Info[FREESWAP_MEM] = pagetob(swap_free);
-}
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 53f4fe048..c03157c40 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -92,7 +92,6 @@ extern "C"
runRdb( flags );
// Write some Qt root property.
-#ifndef __osf__ // this crashes under Tru64 randomly -- will fix later
TQByteArray properties;
TQDataStream d(properties, IO_WriteOnly);
d.setVersion( 3 ); // Qt2 apps need this.
@@ -105,7 +104,6 @@ extern "C"
XChangeProperty(tqt_xdisplay(), RootWindow(tqt_xdisplay(), i),
a, a, 8, PropModeReplace,
(unsigned char*) properties.data(), properties.size());
-#endif
}
}
diff --git a/konsole/README.ports b/konsole/README.ports
index 06c3b6c13..71f3ae154 100644
--- a/konsole/README.ports
+++ b/konsole/README.ports
@@ -19,7 +19,6 @@ Lars Doelle <[email protected]>
Platform Experts
----------------
-- Tru64 - Thomas Leitner <[email protected]>
- Solaris - Stephan Kulow <[email protected]>
- FreeBSD - ?
- HP-UX - ?
diff --git a/ksysguard/configure.in.in b/ksysguard/configure.in.in
index f4ab83853..005a10495 100644
--- a/ksysguard/configure.in.in
+++ b/ksysguard/configure.in.in
@@ -7,7 +7,6 @@ case "$host" in
*-*-dragonfly*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
- *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
*-*-irix*) ksysguardd_compile=yes; UNAME='Irix' ;;
*-*-openbsd*) ksysguardd_compile=yes; UNAME='OpenBSD' ;;
*) ksysguardd_compile=no; UNAME='' ;;
@@ -20,7 +19,6 @@ AM_CONDITIONAL(include_ksysguardd_linux, test "$UNAME" = Linux)
AM_CONDITIONAL(include_ksysguardd_freebsd, test "$UNAME" = FreeBSD)
AM_CONDITIONAL(include_ksysguardd_netbsd, test "$UNAME" = NetBSD)
AM_CONDITIONAL(include_ksysguardd_solaris, test "$UNAME" = Solaris)
-AM_CONDITIONAL(include_ksysguardd_tru64, test "$UNAME" = Tru64)
AM_CONDITIONAL(include_ksysguardd_irix, test "$UNAME" = Irix)
AM_CONDITIONAL(include_ksysguardd_openbsd, test "$UNAME" = OpenBSD)
AC_SUBST(UNAME)
diff --git a/ksysguard/ksysguardd/Makefile.am b/ksysguard/ksysguardd/Makefile.am
index 0e6da33ad..0e1f1122a 100644
--- a/ksysguard/ksysguardd/Makefile.am
+++ b/ksysguard/ksysguardd/Makefile.am
@@ -12,9 +12,6 @@ endif
if include_ksysguardd_solaris
solaris_SUBDIR = Solaris
endif
-if include_ksysguardd_tru64
-tru64_SUBDIR = Tru64
-endif
if include_ksysguardd_irix
irix_SUBDIR = Irix
endif
@@ -23,7 +20,7 @@ openbsd_SUBDIR = OpenBSD
endif
SUBDIRS = $(linux_SUBDIR) $(freebsd_SUBDIR) $(netbsd_SUBDIR)\
- $(solaris_SUBDIR) $(tru64_SUBDIR) $(irix_SUBDIR) $(openbsd_SUBDIR)
+ $(solaris_SUBDIR) $(irix_SUBDIR) $(openbsd_SUBDIR)
KSYSGUARDDRCFILE=$(sysconfdir)/ksysguarddrc
INCLUDES = -DKSYSGUARDDRCFILE="\"$(KSYSGUARDDRCFILE)\"" -DOSTYPE_$(UNAME) -I$(srcdir)/../CContLib -I$(srcdir)/$(UNAME) $(all_includes)
diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
index 6130f2a83..e92bca5e4 100644
--- a/ksysguard/ksysguardd/modules.h
+++ b/ksysguard/ksysguardd/modules.h
@@ -83,12 +83,6 @@
#include "cpu.h"
#endif /* OSTYPE_Irix */
-#ifdef OSTYPE_Tru64
-#include "LoadAvg.h"
-#include "Memory.h"
-#include "NetDev.h"
-#endif /* OSTYPE_Tru64 */
-
#ifdef OSTYPE_OpenBSD
#include "cpu.h"
#include "memory.h"
@@ -161,12 +155,6 @@ struct SensorModul SensorModulList[] = {
{ "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC, 0, NULLTIME },
#endif /* OSTYPE_Irix */
-#ifdef OSTYPE_Tru64
- { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME },
- { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME },
- { "NetDev", initNetDev, exitNetDev, updateNetDev, NULLVVFUNC, 0, NULLTIME },
-#endif /* OSTYPE_Tru64 */
-
#ifdef OSTYPE_OpenBSD
{ "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC, 0, NULLTIME },
{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME },
diff --git a/nsplugins/sdk/jri_md.h b/nsplugins/sdk/jri_md.h
index b7d30ef7f..3faf842dc 100644
--- a/nsplugins/sdk/jri_md.h
+++ b/nsplugins/sdk/jri_md.h
@@ -178,16 +178,7 @@ typedef long jint;
#ifdef HAVE_LONG_LONG
-#ifdef OSF1
-
-/* long is default 64-bit on OSF1, -std1 does not allow long long */
-typedef long jlong;
-typedef unsigned long julong;
-#define jlong_MAXINT 0x7fffffffffffffffL
-#define jlong_MININT 0x8000000000000000L
-#define jlong_ZERO 0x0L
-
-#elif (defined(WIN32) || defined(_WIN32))
+#if (defined(WIN32) || defined(_WIN32))
typedef LONGLONG jlong;
typedef DWORDLONG julong;
diff --git a/tdm/backend/dm.h b/tdm/backend/dm.h
index ae731aeca..c3d327a5e 100644
--- a/tdm/backend/dm.h
+++ b/tdm/backend/dm.h
@@ -61,10 +61,6 @@ from the copyright holder.
#include <errno.h>
#ifdef XDMCP
-# if defined(__osf__)
-/* someone somewhere defines QUERY under Tru64 which confuses Xdmcp.h */
-# undef QUERY
-# endif
# include <X11/Xdmcp.h>
#endif
diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp
index d47576c12..e885b3b5a 100644
--- a/tdm/kfrontend/kconsole.cpp
+++ b/tdm/kfrontend/kconsole.cpp
@@ -39,12 +39,10 @@ extern "C" {
#include <termios.h>
}
#endif
-#if !defined(__osf__)
#ifdef HAVE_TERMIO_H
/* needed at least on AIX */
#include <termio.h>
#endif
-#endif
#if defined (_HPUX_SOURCE)
#define _TERMIOS_INCLUDED
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-09 02:11:42 +0000