diff options
| author | Thierry Crozat | 2017-09-11 21:38:58 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2017-09-11 21:38:58 +0100 |
| commit | 5d419c2b58841b2bc56c40caebab5e38622dee88 (patch) | |
| tree | 8414a16c61b6393d9cef5bd6eba146fac5e183cb /audio/mods/module_mod_xm_s3m.h | |
| parent | a2bafbbe76bb481029e4b6dd29d4777f55f6d569 (diff) | |
| download | scummvm-rg350-5d419c2b58841b2bc56c40caebab5e38622dee88.tar.gz scummvm-rg350-5d419c2b58841b2bc56c40caebab5e38622dee88.tar.bz2 scummvm-rg350-5d419c2b58841b2bc56c40caebab5e38622dee88.zip | |
AUDIO: Rename two functions in ModuleModXmS3m
This is an attempt to fix a compilation error on some platforms.
The error message seems to indicate that log2 might be a define
on thos platforms.
Note that the log2 implementation in ModuleModXmS3m is not the binary
logarithm, and we cannot use Common::intLog2.
Diffstat (limited to 'audio/mods/module_mod_xm_s3m.h')
| -rw-r--r-- | audio/mods/module_mod_xm_s3m.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/mods/module_mod_xm_s3m.h b/audio/mods/module_mod_xm_s3m.h index d92ac6679c..b4c984ad05 100644 --- a/audio/mods/module_mod_xm_s3m.h +++ b/audio/mods/module_mod_xm_s3m.h @@ -155,8 +155,8 @@ public: bool load(Common::SeekableReadStream &stream); // math functions - static int log2(int x); - static int exp2(int x); + static int moduleLog2(int x); + static int moduleExp2(int x); private: bool loadMod(Common::SeekableReadStream &stream); |