aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorD G Turner2011-07-19 02:29:13 +0100
committerD G Turner2011-07-19 02:29:13 +0100
commit54f25aa84373715001c56155673fb59cfe44b573 (patch)
tree636cbbacffd6b5adfcf125917bbb70ed38503dea /common
parent1f3ccd4eed78c94da4856044d5351c1fccc53607 (diff)
downloadscummvm-rg350-54f25aa84373715001c56155673fb59cfe44b573.tar.gz
scummvm-rg350-54f25aa84373715001c56155673fb59cfe44b573.tar.bz2
scummvm-rg350-54f25aa84373715001c56155673fb59cfe44b573.zip
COMMON: Renamed Integer Log2 function from log2 to intLog2.
This avoids naming collisions with system libraries on some platforms i.e. DS, DC where the log2 is realised by macro.
Diffstat (limited to 'common')
-rw-r--r--common/math.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/math.h b/common/math.h
index 2ad71cee65..d1f3e77abf 100644
--- a/common/math.h
+++ b/common/math.h
@@ -61,7 +61,7 @@ static const char LogTable256[256] = {
LT(7), LT(7), LT(7), LT(7), LT(7), LT(7), LT(7), LT(7)
};
-inline uint32 log2(uint32 v) {
+inline uint32 intLog2(uint32 v) {
register uint32 t, tt;
if ((tt = v >> 16))