diff options
| author | Ralf Nolden <nolden@kde.org> | 2016-06-06 08:44:38 +0200 |
|---|---|---|
| committer | Ralf Nolden <nolden@kde.org> | 2016-06-06 16:20:51 +0000 |
| commit | f969c50bc2ea008e5e967e18f5cf38543c3b9059 (patch) | |
| tree | 14ebea58c263651661d65c147807f03c7f66e08e | |
| parent | 23ac4a1a884d286a2254c087093084af5fce201b (diff) | |
Remove obsolete a.out code after QT_AOUT_UNDERSCORE is gone
Old versions of OpenBSD and NetBSD mkspecs had the QT_AOUT_UNDERSCORE
define declared in their qplatformdefs.h to support systems still
using a.out format. As those systems are long obsolete and the defines
are removed, remove the obsolete code, too.
Change-Id: Ia9e2f2d6de81fb182ef4c995b29062afe570b8b9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/plugin/qlibrary_unix.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index a7dfd43a5c..9db0b7ff39 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -50,10 +50,6 @@ # include <private/qcore_mac_p.h> #endif -#if defined(QT_AOUT_UNDERSCORE) -#include <string.h> -#endif - #if (defined(Q_OS_VXWORKS) && !defined(VXWORKS_RTP)) || defined (Q_OS_NACL) #define QT_NO_DYNAMIC_LIBRARY #endif @@ -305,14 +301,7 @@ Q_CORE_EXPORT QFunctionPointer qt_mac_resolve_sys(void *handle, const char *symb QFunctionPointer QLibraryPrivate::resolve_sys(const char* symbol) { -#if defined(QT_AOUT_UNDERSCORE) - // older a.out systems add an underscore in front of symbols - char* undrscr_symbol = new char[strlen(symbol)+2]; - undrscr_symbol[0] = '_'; - strcpy(undrscr_symbol+1, symbol); - QFunctionPointer address = QFunctionPointer(dlsym(pHnd, undrscr_symbol)); - delete [] undrscr_symbol; -#elif defined(QT_HPUX_LD) +#if defined(QT_HPUX_LD) QFunctionPointer address = 0; if (shl_findsym((shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address) < 0) address = 0; |