diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-26 10:04:43 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-26 10:04:43 +0200 |
| commit | fe3f99c92a8437a353ba12075d6c3273d04c4e3f (patch) | |
| tree | 34d97babbe5696f21779866fafad217b60c2bead /plugins/adplug/adplug/a2m.cpp | |
| parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) | |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/a2m.cpp')
| -rw-r--r-- | plugins/adplug/adplug/a2m.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/adplug/adplug/a2m.cpp b/plugins/adplug/adplug/a2m.cpp index d9d775e2..83940b68 100644 --- a/plugins/adplug/adplug/a2m.cpp +++ b/plugins/adplug/adplug/a2m.cpp @@ -29,7 +29,7 @@ * Following commands are ignored: Gxy, Hxy, Kxy - &xy */ -#include <cstring> +#include <string.h> #include "a2m.h" const unsigned int Ca2mLoader::MAXFREQ = 2000, @@ -59,7 +59,7 @@ CPlayer *Ca2mLoader::factory(Copl *newopl) return new Ca2mLoader(newopl); } -bool Ca2mLoader::load(const std::string &filename, const CFileProvider &fp) +bool Ca2mLoader::load(const char *filename, const CFileProvider &fp) { binistream *f = fp.open(filename); if(!f) return false; char id[10]; |