[Scummvm-cvs-logs] SF.net SVN: scummvm:[51797] scummvm/branches/gsoc2010-plugins/backends/ plugins
toneman1138 at users.sourceforge.net
toneman1138 at users.sourceforge.net
Fri Aug 6 22:09:16 CEST 2010
Revision: 51797
http://scummvm.svn.sourceforge.net/scummvm/?rev=51797&view=rev
Author: toneman1138
Date: 2010-08-06 20:09:16 +0000 (Fri, 06 Aug 2010)
Log Message:
-----------
made a couple of functions in DLObject virtual, other minor fixes/changes
Modified Paths:
--------------
scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.h
scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp
Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.h 2010-08-06 19:13:19 UTC (rev 51796)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.h 2010-08-06 20:09:16 UTC (rev 51797)
@@ -59,7 +59,7 @@
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 @@
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 @@
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
Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp 2010-08-06 19:13:19 UTC (rev 51796)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp 2010-08-06 20:09:16 UTC (rev 51797)
@@ -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) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list