summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------admin0
-rw-r--r--akregator/src/mk4storage/metakit/src/header.h4
-rw-r--r--indexlib/boost-compat/config/requires_threads.h4
-rw-r--r--indexlib/boost-compat/config/select_compiler_config.h4
-rw-r--r--indexlib/boost-compat/config/stdlib/libstdcpp3.h6
-rw-r--r--mimelib/mimelib/msgcmp.h2
-rw-r--r--mimelib/mimelib/token.h2
-rw-r--r--tdefile-plugins/rfc822/tdefile_rfc822.cpp4
-rw-r--r--tderesources/groupwise/soap/patches/socklen.diff4
-rw-r--r--tderesources/groupwise/soap/stdsoap2.cpp4
-rw-r--r--tderesources/groupwise/soap/stdsoap2.h20
11 files changed, 8 insertions, 46 deletions
diff --git a/admin b/admin
-Subproject afaec96a4101e0771fb9969690e20ce5f6df90e
+Subproject 09c83bda932a8ba3b215b852f199bc47f1ed965
diff --git a/akregator/src/mk4storage/metakit/src/header.h b/akregator/src/mk4storage/metakit/src/header.h
index 8891acaa7..4f62551fa 100644
--- a/akregator/src/mk4storage/metakit/src/header.h
+++ b/akregator/src/mk4storage/metakit/src/header.h
@@ -91,9 +91,7 @@
// Use '#define q4_xxx 1' to flag the choice of an IDE, and optionally also
// add '#include "file.h"' to force inclusion of a header file right here.
-#if defined (__DECCXX) // DEC C++
-#define q4_DECC 1
-#elif defined (__GNUC__) // GNU C++
+#if defined (__GNUC__) // GNU C++
#include "gnuc.h"
#elif defined (_MSC_VER) // Microsoft Visual C++
#include "msvc.h"
diff --git a/indexlib/boost-compat/config/requires_threads.h b/indexlib/boost-compat/config/requires_threads.h
index a8236b1f7..ffa75e9d5 100644
--- a/indexlib/boost-compat/config/requires_threads.h
+++ b/indexlib/boost-compat/config/requires_threads.h
@@ -50,10 +50,6 @@
// SGI MIPSpro C++
# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -D_SGI_MP_SOURCE"
-#elif defined __DECCXX
-// Compaq Tru64 Unix cxx
-# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -pthread"
-
#elif defined __SUNPRO_CC
// Sun Workshop Compiler C++
# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -mt"
diff --git a/indexlib/boost-compat/config/select_compiler_config.h b/indexlib/boost-compat/config/select_compiler_config.h
index 7395aa026..00b4de967 100644
--- a/indexlib/boost-compat/config/select_compiler_config.h
+++ b/indexlib/boost-compat/config/select_compiler_config.h
@@ -36,10 +36,6 @@
// SGI MIPSpro C++
# define BOOST_COMPILER_CONFIG "boost/config/compiler/sgi_mipspro.hpp"
-#elif defined __DECCXX
-// Compaq Tru64 Unix cxx
-# define BOOST_COMPILER_CONFIG "boost/config/compiler/compaq_cxx.hpp"
-
#elif defined __ghs
// Greenhills C++
# define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp"
diff --git a/indexlib/boost-compat/config/stdlib/libstdcpp3.h b/indexlib/boost-compat/config/stdlib/libstdcpp3.h
index 99e711ce4..bbf295599 100644
--- a/indexlib/boost-compat/config/stdlib/libstdcpp3.h
+++ b/indexlib/boost-compat/config/stdlib/libstdcpp3.h
@@ -22,12 +22,6 @@
# define BOOST_NO_STD_WSTREAMBUF
#endif
-#if defined(__osf__) && !defined(_REENTRANT) && defined(_GLIBCXX_HAVE_GTHR_DEFAULT)
-// GCC 3.4 on Tru64 forces the definition of _REENTRANT when any std lib header
-// file is included, therefore for consistency we define it here as well.
-# define _REENTRANT
-#endif
-
#ifdef __GLIBCXX__ // gcc 3.4 and greater:
# ifdef _GLIBCXX_HAVE_GTHR_DEFAULT
//
diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h
index c9e6707ee..4c66a2b23 100644
--- a/mimelib/mimelib/msgcmp.h
+++ b/mimelib/mimelib/msgcmp.h
@@ -31,7 +31,7 @@
#include <mimelib/string.h>
#endif
-#if !(defined(__DECCXX) && defined(__linux__))
+#if defined(__linux__))
#include <iosfwd>
#endif
diff --git a/mimelib/mimelib/token.h b/mimelib/mimelib/token.h
index 7168ea091..ec52ca849 100644
--- a/mimelib/mimelib/token.h
+++ b/mimelib/mimelib/token.h
@@ -51,7 +51,7 @@
// classes are fairly simple and efficient.
// In addition, polymorphism is not needed to use the tokenizer classes.
-#if !(defined(__DECCXX) && defined(__linux__))
+#if defined(__linux__))
#include <iosfwd>
#endif
diff --git a/tdefile-plugins/rfc822/tdefile_rfc822.cpp b/tdefile-plugins/rfc822/tdefile_rfc822.cpp
index f1b4d6ff4..e8db73573 100644
--- a/tdefile-plugins/rfc822/tdefile_rfc822.cpp
+++ b/tdefile-plugins/rfc822/tdefile_rfc822.cpp
@@ -32,11 +32,7 @@
#include <tqfile.h>
#include <tqdatetime.h>
-#if !defined(__osf__)
#include <inttypes.h>
-#else
-typedef unsigned short uint32_t;
-#endif
typedef KGenericFactory<KRfc822Plugin> Rfc822Factory;
diff --git a/tderesources/groupwise/soap/patches/socklen.diff b/tderesources/groupwise/soap/patches/socklen.diff
index e6494bc96..8355e1c32 100644
--- a/tderesources/groupwise/soap/patches/socklen.diff
+++ b/tderesources/groupwise/soap/patches/socklen.diff
@@ -6,7 +6,7 @@ diff -u -3 -p -r1.3 stdsoap2.cpp
--- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3
+++ soap/stdsoap2.cpp 6 Dec 2004 21:27:25 -0000
@@ -3072,7 +3072,7 @@ tcp_connect(struct soap *soap, const cha
- #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
+ #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS)
int n = sizeof(struct sockaddr_in);
#else
- size_t n = sizeof(struct sockaddr_in);
@@ -15,7 +15,7 @@ diff -u -3 -p -r1.3 stdsoap2.cpp
fd_set fds;
if (soap->connect_timeout > 0)
@@ -3503,7 +3503,10 @@ tcp_accept(struct soap *soap, int s, str
- #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
+ #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS)
fd = (int)accept((SOAP_SOCKET)s, a, n);
#else
- fd = (int)accept((SOAP_SOCKET)s, a, (size_t*)n);
diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp
index dfe0afc75..959878588 100644
--- a/tderesources/groupwise/soap/stdsoap2.cpp
+++ b/tderesources/groupwise/soap/stdsoap2.cpp
@@ -2996,7 +2996,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr)
strncpy(addrcopy, addr, strlen(addr)+1);
iadd = inet_addr(addrcopy);
#else
-#if defined(_AIXVERSION_431) || defined(__osf__)
+#if defined(_AIXVERSION_431)
struct hostent_data ht_data;
#endif
iadd = inet_addr(addr);
@@ -3011,7 +3011,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr)
#if defined(__GLIBC__)
if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0)
host = NULL;
-#elif defined(_AIXVERSION_431) || defined(__osf__)
+#elif defined(_AIXVERSION_431)
memset((void*)&ht_data, 0, sizeof(ht_data));
if (gethostbyname_r(addr, &hostent, &ht_data) < 0)
{ host = NULL;
diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h
index 795b25287..05fee0bc3 100644
--- a/tderesources/groupwise/soap/stdsoap2.h
+++ b/tderesources/groupwise/soap/stdsoap2.h
@@ -278,24 +278,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# define HAVE_WCTOMB
# define HAVE_MBTOWC
# define HAVE_ISNAN
-# elif defined(__osf__)
-# define HAVE_STRRCHR
-# define HAVE_STRTOD
-# define HAVE_SSCANF
-# define HAVE_STRTOL
-# define HAVE_STRTOUL
-# define HAVE_STRTOLL
-# define HAVE_STRTOULL
-# define HAVE_GETTIMEOFDAY
-# define HAVE_SYS_TIMEB_H
-# define HAVE_RAND_R
-# define HAVE_GMTIME_R
-# define HAVE_LOCALTIME_R
-# define __USE_STD_IOSTREAM
-# define HAVE_WCTOMB
-# define HAVE_MBTOWC
-# define SOAP_LONG_FORMAT "%ld"
-# define SOAP_ULONG_FORMAT "%lu"
# elif defined(MAC_CARBON)
# define WITH_NOIO
# define HAVE_STRRCHR
@@ -528,7 +510,7 @@ extern "C" {
# define SOAP_SOCKLEN_T SOCKLEN_T
#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__TQNX__) || defined(TQNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__)
# define SOAP_SOCKLEN_T socklen_t
-#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(__osf__) || defined(VXWORKS)
+#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS)
# define SOAP_SOCKLEN_T int
#else
# define SOAP_SOCKLEN_T size_t
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-07 05:50:37 +0000