summaryrefslogtreecommitdiff
path: root/thirdparty/brotli
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2016-03-30 18:45:12 +0100
committerJose Fonseca <jfonseca@vmware.com>2016-03-30 21:27:54 +0100
commit55a270c4471eac51174a749857eef9db6371b1e8 (patch)
treef1c3a9c548530cd3e82968c2426adf79497b0acf /thirdparty/brotli
parente9e8578d85c8d309fb294f22c8376167f0cdf082 (diff)
brotli: Workaround lack of log2 in Android.
https://code.google.com/p/android/issues/detail?id=54418
Diffstat (limited to 'thirdparty/brotli')
-rw-r--r--thirdparty/brotli/enc/fast_log.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/thirdparty/brotli/enc/fast_log.h b/thirdparty/brotli/enc/fast_log.h
index f9450ed5..c3f3ca73 100644
--- a/thirdparty/brotli/enc/fast_log.h
+++ b/thirdparty/brotli/enc/fast_log.h
@@ -124,7 +124,7 @@ static inline double FastLog2(size_t v) {
if (v < sizeof(kLog2Table) / sizeof(kLog2Table[0])) {
return kLog2Table[v];
}
-#if defined(_MSC_VER) && _MSC_VER <= 1600
+#if defined(_MSC_VER) && _MSC_VER <= 1600 || defined(ANDROID)
// Visual Studio 2010 does not have the log2() function defined, so we use
// log() and a multiplication instead.
static const double kLog2Inv = 1.4426950408889634f;