diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-01-17 19:34:22 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-01-17 19:34:22 +0900 |
| commit | 2080def64c64099ea7685d903d070e028a8cb916 (patch) | |
| tree | f645ca3060a53cae9729cf3e9256da820e534e35 /src/tools | |
| parent | 37a07263c70308f7ddef4aac747446d5ede82374 (diff) | |
| download | tqt-drop/hpux-support.tar.gz tqt-drop/hpux-support.zip | |
Remove support for HPUX, which is discontinued and does not provide a c++17 complaint compiler.drop/hpux-support
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tqdatastream.cpp | 6 | ||||
| -rw-r--r-- | src/tools/tqglobal.h | 18 | ||||
| -rw-r--r-- | src/tools/tqgpluginmanager.cpp | 2 | ||||
| -rw-r--r-- | src/tools/tqlibrary.cpp | 2 | ||||
| -rw-r--r-- | src/tools/tqlibrary_unix.cpp | 51 | ||||
| -rw-r--r-- | src/tools/tqstring.cpp | 2 |
6 files changed, 1 insertions, 80 deletions
diff --git a/src/tools/tqdatastream.cpp b/src/tools/tqdatastream.cpp index 506e6dd04..30ee6e37e 100644 --- a/src/tools/tqdatastream.cpp +++ b/src/tools/tqdatastream.cpp @@ -487,10 +487,6 @@ void TQDataStream::setByteOrder( int bo ) TQDataStream read functions *****************************************************************************/ -#if defined(Q_OS_HPUX) && !defined(__LP64__) -extern "C" long long __strtoll( const char *, char**, int ); -#endif - static TQ_INT64 read_int_ascii( TQDataStream *s ) { int n = 0; @@ -511,8 +507,6 @@ static TQ_INT64 read_int_ascii( TQDataStream *s ) return strtol( buf, (char**)0, 10 ); # elif defined(Q_OS_WIN) return _atoi64( buf ); -# elif defined(Q_OS_HPUX) - return __strtoll( buf, (char**)0, 10 ); # elif defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020 return strtoq( buf, (char**)0, 10 ); # else diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index 8bac4e993..ff0d7d835 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -59,7 +59,6 @@ WIN32 - Win32 (Windows 95/98/ME and Windows NT/2000/XP) CYGWIN - Cygwin SOLARIS - Sun Solaris - HPUX - HP-UX ULTRIX - DEC Ultrix LINUX - Linux FREEBSD - FreeBSD @@ -103,8 +102,6 @@ # define Q_OS_WIN32 #elif defined(__sun) || defined(sun) # define Q_OS_SOLARIS -#elif defined(hpux) || defined(__hpux) -# define Q_OS_HPUX #elif defined(__ultrix) || defined(ultrix) # define Q_OS_ULTRIX #elif defined(__GNU__) @@ -191,8 +188,6 @@ SUN - Sun WorkShop, Forte Developer, or Sun ONE Studio C++ MIPS - MIPSpro C++ DEC - DEC C++ - HP - HPUX C++ - HPACC - HPUX ANSI C++ USLC - UDK, and UnixWare 2.X C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows @@ -241,10 +236,6 @@ # if __GNUC__ == 2 && __GNUC_MINOR__ <= 95 # define Q_NO_USING_KEYWORD # endif -/* GCC 3.1 and GCC 3.2 wrongly define _SB_CTYPE_MACROS on HP-UX */ -# if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1 -# define Q_WRONG_SB_CTYPE_MACROS -# endif /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack TQChars to 16 bits, to avoid @@ -377,15 +368,6 @@ # define Q_NO_USING_KEYWORD # endif -#elif defined(Q_OS_HPUX) -/* __HP_aCC was not defined in first aCC releases */ -# if defined(__HP_aCC) || __cplusplus >= 199707L -# define Q_CC_HPACC -# else -# define Q_CC_HP -# endif -# define Q_NO_USING_KEYWORD /* ### check "using" status */ - #else # error "TQt has not been tested with this compiler - talk to qt-bugs@trolltech.com" #endif diff --git a/src/tools/tqgpluginmanager.cpp b/src/tools/tqgpluginmanager.cpp index a19532136..e38e8e84c 100644 --- a/src/tools/tqgpluginmanager.cpp +++ b/src/tools/tqgpluginmanager.cpp @@ -321,8 +321,6 @@ void TQGPluginManager::addLibraryPath( const TQString& path ) TQString filter = "*.dll"; #elif defined(Q_OS_MACX) TQString filter = "*.dylib; *.so; *.bundle"; -#elif defined(Q_OS_HPUX) - TQString filter = "*.sl"; #elif defined(Q_OS_OPENBSD) TQString filter = "*.so; *.so.*"; #elif defined(Q_OS_UNIX) diff --git a/src/tools/tqlibrary.cpp b/src/tools/tqlibrary.cpp index 947492f39..65e2f5326 100644 --- a/src/tools/tqlibrary.cpp +++ b/src/tools/tqlibrary.cpp @@ -407,8 +407,6 @@ TQString TQLibrary::library() const filters << ".so"; filters << ".bundle"; filters << ".dylib"; //the last one is also the default one.. -#elif defined(Q_OS_HPUX) - filters << ".sl"; #else filters << ".so"; #endif diff --git a/src/tools/tqlibrary_unix.cpp b/src/tools/tqlibrary_unix.cpp index 7e2997087..f7122d381 100644 --- a/src/tools/tqlibrary_unix.cpp +++ b/src/tools/tqlibrary_unix.cpp @@ -56,55 +56,6 @@ It's not too hard to guess what the functions do. */ -#if defined(QT_HPUX_LD) // for HP-UX < 11.x and 32 bit - -bool TQLibraryPrivate::loadLibrary() -{ - if ( pHnd ) - return true; - - TQString filename = library->library(); - - pHnd = (void*)shl_load( filename.latin1(), BIND_DEFERRED | BIND_NONFATAL | DYNAMIC_PATH, 0 ); -#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) - if ( !pHnd ) - tqWarning( "%s: failed to load library!", filename.latin1() ); -#endif - return pHnd != 0; -} - -bool TQLibraryPrivate::freeLibrary() -{ - if ( !pHnd ) - return true; - - if ( shl_unload( (shl_t)pHnd ) ) { -#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) - TQString filename = library->library(); - tqWarning( "%s: Failed to unload library!", filename.latin1() ); -#endif - return false; - } - pHnd = 0; - return true; -} - -void* TQLibraryPrivate::resolveSymbol( const char* symbol ) -{ - if ( !pHnd ) - return 0; - - void* address = 0; - if ( shl_findsym( (shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address ) < 0 ) { -#if defined(QT_DEBUG_COMPONENT) - TQString filename = library->library(); - tqWarning( "%s: couldn't resolve symbol \"%s\"", filename.latin1(), symbol ); -#endif - } - return address; -} - -#else // POSIX #include <dlfcn.h> #ifndef DL_PREFIX //for mac dlcompat # define DL_PREFIX(x) x @@ -164,6 +115,4 @@ void* TQLibraryPrivate::resolveSymbol( const char* symbol ) return address; } -#endif // POSIX - #endif diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp index 625884c7d..254c1ad01 100644 --- a/src/tools/tqstring.cpp +++ b/src/tools/tqstring.cpp @@ -702,7 +702,7 @@ TQStringData* TQString::makeSharedNull() } TQString::shared_null = new TQStringData; -#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) +#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_AIX) TQString *that = const_cast<TQString *>(&TQString::null); that->d = TQString::shared_null; #endif |
