Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drop support for a.out format

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-16 08:03:11 +00:00
parent 145ec2cedf
commit 9e7d367c2e
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/global/qplatformdefs.h
View file

@ -44,13 +44,6 @@
# ifndef _GNU_SOURCE # ifndef _GNU_SOURCE
# define _GNU_SOURCE # define _GNU_SOURCE
# endif # 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 #endif
#include <unistd.h> #include <unistd.h>

13
src/core/plugin/qlibrary_unix.cpp
View file

@ -41,10 +41,6 @@
#ifndef QT_NO_LIBRARY #ifndef QT_NO_LIBRARY
#if defined(QT_AOUT_UNDERSCORE)
#include <string.h>
#endif
#if defined (Q_OS_NACL) #if defined (Q_OS_NACL)
#define QT_NO_DYNAMIC_LIBRARY #define QT_NO_DYNAMIC_LIBRARY
#endif #endif
@ -203,14 +199,7 @@ bool QLibraryPrivate::unload_sys()
void* QLibraryPrivate::resolve_sys(const char* symbol) void* QLibraryPrivate::resolve_sys(const char* symbol)
{ {
#if defined(QT_AOUT_UNDERSCORE) #if defined (QT_NO_DYNAMIC_LIBRARY)
// 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)
void *address = Q_NULLPTR; void *address = Q_NULLPTR;
#else #else
void* address = ::dlsym(pHnd, symbol); void* address = ::dlsym(pHnd, symbol);