summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-07-27 03:03:30 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-13 00:46:55 +0100
commit51a9a09ba8ca9a9d7bc00e3fac281a11cc94fd02 (patch)
tree43f0ecf0e1831e1c4accd46b7e5d41e9a4381bc3
parent2e748183748734627533817663b38ede4acb0e55 (diff)
android: gallium/auxiliary: drop log2/log2f redefitions
Recent versions of bionic has picked up support for these functions, leading to build issues due to the redefition of the symbols. Note: wrapping things in #ifdef does not cut it :\ Identical patch is available in chromium, android-x86 and perhaps other projects. commit 66c1c789ce3407472de9ed620c9f815639058835 Author: rmcilroy@chromium.org Date: Wed Apr 02 10:59:34 2014 +0000 Porting to x64 Android. Remove redefinitions of log2 and log2f. BUG= R=kbr@chromium.org Review URL: https://codereview.chromium.org/216773005 commit 9cc0a0d2b0499556680b182888af86f29d4ec30b Author: Chih-Wei Huang <cwhuang@linux.org.tw> Date: Sun Jul 21 23:04:19 2013 +0800 android: remove log2, log2f The functions are already defined in the latest bionic. Cc: Chia-I Wu <olvaffe@gmail.com> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Chia-I Wu <olvaffe@gmail.com>
-rw-r--r--src/gallium/auxiliary/util/u_math.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index 2823e0570fc..acd5e5c5f25 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -149,28 +149,6 @@ roundf(float x)
#endif /* _MSC_VER */
-#ifdef PIPE_OS_ANDROID
-
-static INLINE
-double log2(double d)
-{
- return log(d) * (1.0 / M_LN2);
-}
-
-/* workaround a conflict with main/imports.h */
-#ifdef log2f
-#undef log2f
-#endif
-
-static INLINE
-float log2f(float f)
-{
- return logf(f) * (float) (1.0 / M_LN2);
-}
-
-#endif
-
-
#if __STDC_VERSION__ < 199901L && (!defined(__cplusplus) || defined(_MSC_VER))
static INLINE long int
lrint(double d)