diff options
| author | Tony Puccinelli | 2010-08-06 20:09:16 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-06 20:09:16 +0000 |
| commit | 66225374b2f75f8c5b4406564c35ca476242aa81 (patch) | |
| tree | d0f1b4273a7c204bec5ead23ca2a5d572c8f5713 /backends/plugins | |
| parent | 5696fde1395d61f09bfc5cf0403477a7359e506d (diff) | |
| download | scummvm-rg350-66225374b2f75f8c5b4406564c35ca476242aa81.tar.gz scummvm-rg350-66225374b2f75f8c5b4406564c35ca476242aa81.tar.bz2 scummvm-rg350-66225374b2f75f8c5b4406564c35ca476242aa81.zip | |
made a couple of functions in DLObject virtual, other minor fixes/changes
svn-id: r51797
Diffstat (limited to 'backends/plugins')
| -rw-r--r-- | backends/plugins/elf-loader.h | 6 | ||||
| -rw-r--r-- | backends/plugins/elf-provider.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/backends/plugins/elf-loader.h b/backends/plugins/elf-loader.h index 80ef9b3fe3..0a84d9c0b9 100644 --- a/backends/plugins/elf-loader.h +++ b/backends/plugins/elf-loader.h @@ -59,7 +59,7 @@ protected: void seterror(const char *fmt, ...); void unload(); - bool relocate(Common::SeekableReadStream* DLFile, unsigned long offset, unsigned long size, void *relSegment); + virtual bool relocate(Common::SeekableReadStream* DLFile, unsigned long offset, unsigned long size, void *relSegment); bool load(Common::SeekableReadStream* DLFile); bool readElfHeader(Common::SeekableReadStream* DLFile, Elf32_Ehdr *ehdr); @@ -69,7 +69,7 @@ protected: int loadSymbolTable(Common::SeekableReadStream* DLFile, Elf32_Ehdr *ehdr, Elf32_Shdr *shdr); bool loadStringTable(Common::SeekableReadStream* DLFile, Elf32_Shdr *shdr); void relocateSymbols(Elf32_Addr offset); - bool relocateRels(Common::SeekableReadStream* DLFile, Elf32_Ehdr *ehdr, Elf32_Shdr *shdr); + virtual bool relocateRels(Common::SeekableReadStream* DLFile, Elf32_Ehdr *ehdr, Elf32_Shdr *shdr); public: bool open(const char *path); @@ -77,7 +77,7 @@ public: void *symbol(const char *name); void discard_symtab(); - DLObject(char *errbuf = NULL) : _errbuf(_errbuf), _segment(NULL), _symtab(NULL), + DLObject(char *errbuf = NULL) : _errbuf(errbuf), _segment(NULL), _symtab(NULL), _strtab(NULL), _symbol_cnt(0), _symtab_sect(-1), _dtors_start(NULL), _dtors_end(NULL), _segmentSize(0) { #ifdef MIPS_TARGET diff --git a/backends/plugins/elf-provider.cpp b/backends/plugins/elf-provider.cpp index 43f999b461..22e365130b 100644 --- a/backends/plugins/elf-provider.cpp +++ b/backends/plugins/elf-provider.cpp @@ -31,7 +31,7 @@ #if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET) -void (* ELFPlugin::findSymbol(const char *symbol))() { +DynamicPlugin::VoidFunc ELFPlugin::findSymbol(const char *symbol) { void *func; bool handleNull; if (_dlHandle == NULL) { |