From bd7c1256d9d625be019d4347d45c9ce4bf7c6f8c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 17 Jan 2026 16:46:38 +0900 Subject: Remove support for HPUX, which is discontinued and does not provide a c++17 complaint compiler. Signed-off-by: Michele Calgaro --- akregator/src/mk4storage/metakit/include/mk4.h | 11 +--- akregator/src/mk4storage/metakit/src/fileio.cpp | 3 +- akregator/src/mk4storage/metakit/src/header.h | 2 +- indexlib/boost-compat/config/compiler/hp_acc.h | 69 ---------------------- indexlib/boost-compat/config/platform/hpux.h | 62 ------------------- indexlib/boost-compat/config/requires_threads.h | 8 +-- .../boost-compat/config/select_compiler_config.h | 4 -- .../boost-compat/config/select_platform_config.h | 4 -- indexlib/boost-compat/config/stdlib/roguewave.h | 4 +- mimelib/protocol.cpp | 5 -- tderesources/groupwise/soap/patches/socklen.diff | 4 +- tderesources/groupwise/soap/stdsoap2.h | 21 +------ 12 files changed, 10 insertions(+), 187 deletions(-) delete mode 100644 indexlib/boost-compat/config/compiler/hp_acc.h delete mode 100644 indexlib/boost-compat/config/platform/hpux.h diff --git a/akregator/src/mk4storage/metakit/include/mk4.h b/akregator/src/mk4storage/metakit/include/mk4.h index 2b311246..81c28999 100644 --- a/akregator/src/mk4storage/metakit/include/mk4.h +++ b/akregator/src/mk4storage/metakit/include/mk4.h @@ -100,9 +100,9 @@ // and here's the other end of the scale... #if !defined (_WIN32) && !defined (q4_LONG64) -#if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \ +#if defined (__powerpc64__) || defined(__sparcv9) || \ defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || defined (__mips64) || \ - (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__))) + (defined (__ia64) && defined(__LP64__)) #define q4_LONG64 1 #endif #endif @@ -131,13 +131,6 @@ #ifndef HAVE_LONG_LONG #define HAVE_LONG_LONG 1 #endif -#endif - - // HP aCC -#if defined (__HP_aCC) -#ifndef HAVE_LONG_LONG -#define HAVE_LONG_LONG 1 -#endif #endif // Microsoft Visual C++ diff --git a/akregator/src/mk4storage/metakit/src/fileio.cpp b/akregator/src/mk4storage/metakit/src/fileio.cpp index 8e69ede7..ce59917b 100644 --- a/akregator/src/mk4storage/metakit/src/fileio.cpp +++ b/akregator/src/mk4storage/metakit/src/fileio.cpp @@ -260,7 +260,7 @@ void c4_FileStrategy::DataWrite(t4_i32 pos_, const void* buf_, int len_) fflush(stdout); #endif -#if q4_WIN32 || __hpux || __MACH__ +#if q4_WIN32 || __MACH__ // if (buf_ >= _mapStart && buf_ <= _mapLimit - len_) // a horrendous hack to allow file mapping for Win95 on network drive @@ -268,7 +268,6 @@ void c4_FileStrategy::DataWrite(t4_i32 pos_, const void* buf_, int len_) // // 6-Feb-1999 -- this workaround is not thread safe // 30-Nov-2001 -- changed to use the stack so now it is - // 28-Oct-2002 -- added HP/UX to the mix, to avoid hard lockup char tempBuf [4096]; d4_assert(len_ <= sizeof tempBuf); buf_ = memcpy(tempBuf, buf_, len_); diff --git a/akregator/src/mk4storage/metakit/src/header.h b/akregator/src/mk4storage/metakit/src/header.h index ba8d0e59..bda4fbba 100644 --- a/akregator/src/mk4storage/metakit/src/header.h +++ b/akregator/src/mk4storage/metakit/src/header.h @@ -58,7 +58,7 @@ #elif defined (MSDOS) && defined (__GNUC__) #define q4_DOS 1 #elif defined(unix) || defined(__unix__) || defined(__GNUC__) || \ - defined(_AIX) || defined(__hpux) + defined(_AIX) #define q4_UNIX 1 #elif defined (__VMS) #define q4_VMS 1 diff --git a/indexlib/boost-compat/config/compiler/hp_acc.h b/indexlib/boost-compat/config/compiler/hp_acc.h deleted file mode 100644 index b5c587ab..00000000 --- a/indexlib/boost-compat/config/compiler/hp_acc.h +++ /dev/null @@ -1,69 +0,0 @@ -// (C) Copyright John Maddock 2001 - 2003. -// (C) Copyright Jens Maurer 2001 - 2003. -// (C) Copyright Aleksey Gurtovoy 2002. -// (C) Copyright David Abrahams 2002 - 2003. -// (C) Copyright Toon Knapen 2003. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org for most recent version. - -// HP aCC C++ compiler setup: - -#if (__HP_aCC <= 33100) -# define BOOST_NO_INTEGRAL_INT64_T -# define BOOST_NO_OPERATORS_IN_NAMESPACE -# if !defined(_NAMESPACE_STD) -# define BOOST_NO_STD_LOCALE -# define BOOST_NO_STRINGSTREAM -# endif -#endif - -#if (__HP_aCC <= 33300) -// member templates are sufficiently broken that we disable them for now -# define BOOST_NO_MEMBER_TEMPLATES -# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS -# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE -#endif - -#if (__HP_aCC <= 33900) || !defined(BOOST_STRICT_CONFIG) -# define BOOST_NO_UNREACHABLE_RETURN_DETECTION -# define BOOST_NO_TEMPLATE_TEMPLATES -# define BOOST_NO_SWPRINTF -# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS -// std lib config should set this one already: -//# define BOOST_NO_STD_ALLOCATOR -#endif - -// optional features rather than defects: -#if (__HP_aCC >= 33900) -# define BOOST_HAS_LONG_LONG -# define BOOST_HAS_PARTIAL_STD_ALLOCATOR -#endif - -#if (__HP_aCC >= 50000 ) && (__HP_aCC <= 53800 ) || (__HP_aCC < 31300 ) -# define BOOST_NO_MEMBER_TEMPLATE_KEYWORD -#endif - -#define BOOST_NO_MEMBER_TEMPLATE_FRIENDS - -#define BOOST_COMPILER "HP aCC version " BOOST_STRINGIZE(__HP_aCC) - -// -// versions check: -// we don't support HP aCC prior to version 0: -#if __HP_aCC < 33000 -# error "Compiler not supported or configured - please reconfigure" -#endif -// -// last known and checked version is 0: -#if (__HP_aCC > 53800) -# if defined(BOOST_ASSERT_CONFIG) -# error "Unknown compiler version - please run the configure tests and report the results" -# endif -#endif - - - - diff --git a/indexlib/boost-compat/config/platform/hpux.h b/indexlib/boost-compat/config/platform/hpux.h deleted file mode 100644 index 21049059..00000000 --- a/indexlib/boost-compat/config/platform/hpux.h +++ /dev/null @@ -1,62 +0,0 @@ -// (C) Copyright John Maddock 2001 - 2003. -// (C) Copyright Jens Maurer 2001 - 2003. -// (C) Copyright David Abrahams 2002. -// (C) Copyright Toon Knapen 2003. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org for most recent version. - -// hpux specific config options: - -#define BOOST_PLATFORM "HP-UX" - -// In principle, HP-UX has a nice under the name -// However, it has the following problem: -// Use of UINT32_C(0) results in "0u l" for the preprocessed source -// (verifyable with gcc 2.95.3, assumed for HP aCC) -// #define BOOST_HAS_STDINT_H - -#define BOOST_NO_SWPRINTF -#define BOOST_NO_CWCTYPE - -#ifdef __GNUC__ - // GNU C on HP-UX does not support threads (checked up to gcc 3.3) -# define BOOST_DISABLE_THREADS -#endif - -// boilerplate code: -#define BOOST_HAS_UNISTD_H -#include - -// the following are always available: -#ifndef BOOST_HAS_GETTIMEOFDAY -# define BOOST_HAS_GETTIMEOFDAY -#endif -#ifndef BOOST_HAS_SCHED_YIELD -# define BOOST_HAS_SCHED_YIELD -#endif -#ifndef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE -# define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE -#endif -#ifndef BOOST_HAS_NL_TYPES_H -# define BOOST_HAS_NL_TYPES_H -#endif -#ifndef BOOST_HAS_NANOSLEEP -# define BOOST_HAS_NANOSLEEP -#endif -#ifndef BOOST_HAS_GETTIMEOFDAY -# define BOOST_HAS_GETTIMEOFDAY -#endif -#ifndef BOOST_HAS_DIRENT_H -# define BOOST_HAS_DIRENT_H -#endif -#ifndef BOOST_HAS_CLOCK_GETTIME -# define BOOST_HAS_CLOCK_GETTIME -#endif -#ifndef BOOST_HAS_SIGACTION -# define BOOST_HAS_SIGACTION -#endif - - diff --git a/indexlib/boost-compat/config/requires_threads.h b/indexlib/boost-compat/config/requires_threads.h index ffa75e9d..b405c237 100644 --- a/indexlib/boost-compat/config/requires_threads.h +++ b/indexlib/boost-compat/config/requires_threads.h @@ -20,8 +20,8 @@ // // this is checked up to gcc 3.3: // -#if defined(__sgi) || defined(__hpux) -# error "Multi-threaded programs are not supported by gcc on HPUX or Irix (last checked with gcc 3.3)" +#if defined(__sgi) +# error "Multi-threaded programs are not supported by gcc on Irix (last checked with gcc 3.3)" #endif #endif @@ -54,10 +54,6 @@ // Sun Workshop Compiler C++ # error "Compiler threading support is not turned on. Please set the correct command line options for threading: -mt" -#elif defined __HP_aCC -// HP aCC -# error "Compiler threading support is not turned on. Please set the correct command line options for threading: -mt" - #elif defined(__IBMCPP__) // IBM Visual Age # error "Compiler threading support is not turned on. Please compile the code with the xlC_r compiler" diff --git a/indexlib/boost-compat/config/select_compiler_config.h b/indexlib/boost-compat/config/select_compiler_config.h index 00b4de96..f8f93a07 100644 --- a/indexlib/boost-compat/config/select_compiler_config.h +++ b/indexlib/boost-compat/config/select_compiler_config.h @@ -44,10 +44,6 @@ // Sun Workshop Compiler C++ # define BOOST_COMPILER_CONFIG "boost/config/compiler/sunpro_cc.hpp" -#elif defined __HP_aCC -// HP aCC -# define BOOST_COMPILER_CONFIG "boost/config/compiler/hp_acc.hpp" - #elif defined(__MRC__) || defined(__SC__) // MPW MrCpp or SCpp # define BOOST_COMPILER_CONFIG "boost/config/compiler/mpw.hpp" diff --git a/indexlib/boost-compat/config/select_platform_config.h b/indexlib/boost-compat/config/select_platform_config.h index 5699b2a2..18c5b7b0 100644 --- a/indexlib/boost-compat/config/select_platform_config.h +++ b/indexlib/boost-compat/config/select_platform_config.h @@ -29,10 +29,6 @@ // SGI Irix: # define BOOST_PLATFORM_CONFIG "boost/config/platform/irix.hpp" -#elif defined(__hpux) -// hp unix: -# define BOOST_PLATFORM_CONFIG "boost/config/platform/hpux.hpp" - #elif defined(__CYGWIN__) // cygwin is not win32: # define BOOST_PLATFORM_CONFIG "boost/config/platform/cygwin.hpp" diff --git a/indexlib/boost-compat/config/stdlib/roguewave.h b/indexlib/boost-compat/config/stdlib/roguewave.h index 2e116ff1..df8b1501 100644 --- a/indexlib/boost-compat/config/stdlib/roguewave.h +++ b/indexlib/boost-compat/config/stdlib/roguewave.h @@ -80,10 +80,8 @@ // // RW defines _RWSTD_ALLOCATOR if the allocator is conformant and in use -// (the or _HPACC_ part is a hack - the library seems to define _RWSTD_ALLOCATOR -// on HP aCC systems even though the allocator is in fact broken): // -#if !defined(_RWSTD_ALLOCATOR) || (defined(__HP_aCC) && __HP_aCC <= 33100) +#if !defined(_RWSTD_ALLOCATOR) # define BOOST_NO_STD_ALLOCATOR #endif diff --git a/mimelib/protocol.cpp b/mimelib/protocol.cpp index 4ce5ca1b..2806e4ee 100644 --- a/mimelib/protocol.cpp +++ b/mimelib/protocol.cpp @@ -57,11 +57,6 @@ # define DBG_PROTO_STMT(x) #endif -// WABA: This should be defined by netdb.h -// deller: Needed for HP/UX -#if defined(__hpux) -extern int h_errno; -#endif static int translate_h_errno(int herrno); static const char* get_error_text(int aErrorCode); diff --git a/tderesources/groupwise/soap/patches/socklen.diff b/tderesources/groupwise/soap/patches/socklen.diff index 8355e1c3..9d398849 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(VXWORKS) + #elif defined(WIN32) || defined(__APPLE__) || 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(VXWORKS) + #elif defined(WIN32) || defined(__APPLE__) || 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.h b/tderesources/groupwise/soap/stdsoap2.h index 05fee0bc..b48e28a8 100644 --- a/tderesources/groupwise/soap/stdsoap2.h +++ b/tderesources/groupwise/soap/stdsoap2.h @@ -151,12 +151,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # endif #endif -#if defined(__hpux) -# ifndef HP_UX -# define HP_UX -# endif -#endif - #ifdef __MVS__ # ifndef OS390 # define OS390 @@ -219,19 +213,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # define HAVE_LOCALTIME_R # define HAVE_WCTOMB # define HAVE_MBTOWC -# elif defined(HP_UX) -# define HAVE_STRRCHR -# define HAVE_STRTOD -# define HAVE_SSCANF -# define HAVE_STRTOL -# define HAVE_STRTOUL -# define HAVE_SYS_TIMEB_H -# define HAVE_FTIME -# define HAVE_RAND_R -# define HAVE_GMTIME_R -# define HAVE_LOCALTIME_R -# define HAVE_WCTOMB -# define HAVE_MBTOWC # elif defined(FREEBSD) || defined(__FreeBSD__) # define HAVE_STRRCHR # define HAVE_STRTOD @@ -510,7 +491,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(VXWORKS) +#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) # define SOAP_SOCKLEN_T int #else # define SOAP_SOCKLEN_T size_t -- cgit v1.2.3