From 5d419c2b58841b2bc56c40caebab5e38622dee88 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 11 Sep 2017 21:38:58 +0100 Subject: 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. --- audio/mods/module_mod_xm_s3m.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio/mods/module_mod_xm_s3m.h') 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); -- cgit v1.2.3