diff options
| author | Alyssa Milburn | 2011-07-07 09:24:10 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-07-07 09:24:10 +0200 |
| commit | 66e81d633f987310f12038147ae01b8ce4f640f7 (patch) | |
| tree | 6035a7124789c3e6cdff5f603e9933529b7efdc7 /backends/plugins | |
| parent | affaa1f4d6cf5f27f654029133b1aec7b9eca4b5 (diff) | |
| parent | 72da8ef5adf82d8a65da299207f30af5058ca8a9 (diff) | |
| download | scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.tar.gz scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.tar.bz2 scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.zip | |
Merge remote-tracking branch 'origin/master' into soltys_wip2
Diffstat (limited to 'backends/plugins')
| -rw-r--r-- | backends/plugins/elf/memory-manager.cpp | 2 | ||||
| -rw-r--r-- | backends/plugins/elf/shorts-segment-manager.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/backends/plugins/elf/memory-manager.cpp b/backends/plugins/elf/memory-manager.cpp index 02669b3647..058d818dc4 100644 --- a/backends/plugins/elf/memory-manager.cpp +++ b/backends/plugins/elf/memory-manager.cpp @@ -29,7 +29,9 @@ #include "common/util.h" #include <malloc.h> +namespace Common { DECLARE_SINGLETON(ELFMemoryManager); +} ELFMemoryManager::ELFMemoryManager() : _heap(0), _heapSize(0), _heapAlign(0), diff --git a/backends/plugins/elf/shorts-segment-manager.cpp b/backends/plugins/elf/shorts-segment-manager.cpp index b3a9531c2d..caa328a4f2 100644 --- a/backends/plugins/elf/shorts-segment-manager.cpp +++ b/backends/plugins/elf/shorts-segment-manager.cpp @@ -33,7 +33,9 @@ extern char __plugin_hole_start; // Indicates start of hole in program file for extern char __plugin_hole_end; // Indicates end of hole in program file extern char _gp[]; // Value of gp register +namespace Common { DECLARE_SINGLETON(ShortSegmentManager); // For singleton +} ShortSegmentManager::ShortSegmentManager() { _shortsStart = &__plugin_hole_start ; //shorts segment begins at the plugin hole we made when linking |