diff --git a/src/core/global/qplatformdefs.h b/src/core/global/qplatformdefs.h index b3c5c6c8c..bff17c207 100644 --- a/src/core/global/qplatformdefs.h +++ b/src/core/global/qplatformdefs.h @@ -44,13 +44,6 @@ # ifndef _GNU_SOURCE # define _GNU_SOURCE # endif - -#elif defined(__OpenBSD__) -// Older OpenBSD versions may still use the a.out format instead of ELF. -# ifndef __ELF__ -# define QT_AOUT_UNDERSCORE -# endif - #endif #include diff --git a/src/core/plugin/qlibrary_unix.cpp b/src/core/plugin/qlibrary_unix.cpp index 6bcc70f16..e7c292310 100644 --- a/src/core/plugin/qlibrary_unix.cpp +++ b/src/core/plugin/qlibrary_unix.cpp @@ -41,10 +41,6 @@ #ifndef QT_NO_LIBRARY -#if defined(QT_AOUT_UNDERSCORE) -#include -#endif - #if defined (Q_OS_NACL) #define QT_NO_DYNAMIC_LIBRARY #endif @@ -203,14 +199,7 @@ bool QLibraryPrivate::unload_sys() void* 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); - void* address = ::dlsym(pHnd, undrscr_symbol); - delete [] undrscr_symbol; -#elif defined (QT_NO_DYNAMIC_LIBRARY) +#if defined (QT_NO_DYNAMIC_LIBRARY) void *address = Q_NULLPTR; #else void* address = ::dlsym(pHnd, symbol);