diff options
| author | Tony Puccinelli | 2010-08-06 17:33:44 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-06 17:33:44 +0000 |
| commit | 026c9ba6562a3fb88edcef60b7bd16f2a7f32773 (patch) | |
| tree | d59e4d846368eaa6bebf87e25c9f1f8363b128bd | |
| parent | 4bed67767cc4b8555a3d7169fcbb589ce0145303 (diff) | |
| download | scummvm-rg350-026c9ba6562a3fb88edcef60b7bd16f2a7f32773.tar.gz scummvm-rg350-026c9ba6562a3fb88edcef60b7bd16f2a7f32773.tar.bz2 scummvm-rg350-026c9ba6562a3fb88edcef60b7bd16f2a7f32773.zip | |
got rid of unneccessary 'extern C' section in elf-loader header and refactored arm-relocs.cpp to arm-loader.cpp
svn-id: r51793
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 2 | ||||
| -rw-r--r-- | backends/plugins/arm-loader.cpp (renamed from backends/plugins/arm-relocs.cpp) | 0 | ||||
| -rw-r--r-- | backends/plugins/elf-loader.h | 9 |
3 files changed, 1 insertions, 10 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index e68624679f..86b7bd3628 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -293,7 +293,7 @@ PORT_OBJS := $(portdir)/source/blitters_arm.o $(portdir)/source/cdaudio.o $(port $(portdir)/source/dsoptions.o $(portdir)/source/keys.o $(portdir)/source/wordcompletion.o\ $(portdir)/source/interrupt.o\ $(srcdir)/backends/plugins/elf-loader.o\ - $(srcdir)/backends/plugins/arm-relocs.o + $(srcdir)/backends/plugins/arm-loader.o ifdef USE_PROFILER PORT_OBJS += $(portdir)/source/profiler/cyg-profile.o diff --git a/backends/plugins/arm-relocs.cpp b/backends/plugins/arm-loader.cpp index 8ceccfb7e8..8ceccfb7e8 100644 --- a/backends/plugins/arm-relocs.cpp +++ b/backends/plugins/arm-loader.cpp diff --git a/backends/plugins/elf-loader.h b/backends/plugins/elf-loader.h index d6273b7e71..355b5557a2 100644 --- a/backends/plugins/elf-loader.h +++ b/backends/plugins/elf-loader.h @@ -88,15 +88,6 @@ public: }; -#define RTLD_LAZY 0 - -extern "C" { - void *dlopen(const char *filename, int flags); - int dlclose(void *handle); - const char *dlerror(); - void dlforgetsyms(void *handle); -} - extern void flushDataCache(); #endif /* LOADER_H */ |