commit 409f8da265275e81221aa568dd07f8409af01edd
author Sergey Ulanov <sergeyu@chromium.org> Wed Apr 09 18:47:00 2014 -0700
committer John Koleszar <jkoleszar@google.com> Thu Apr 10 08:54:30 2014 -0700
tree 797a46c3386a76bdbc02f0016ed260da6a1d6c6f
parent 81056e2d5e8d8efd2fa92fd2fdbd706e3482ed5d

Fix onyx_if.c to not to redefine M_LOG2_E if it's already defined.

This fixes warning when compiling libvpx for PNaCl. PNaCl's version
of math.h defines M_LOG2_E.

Change-Id: Iba9450441538e9f82447ad2936bea94d21bafdf1

vp8/encoder/onyx_if.c

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index ef37c0e..32c5997 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1761,8 +1761,11 @@
 
 }
 
+#ifndef M_LOG2_E
 #define M_LOG2_E 0.693147180559945309417
+#endif
 #define log2f(x) (log (x) / (float) M_LOG2_E)
+
 static void cal_mvsadcosts(int *mvsadcost[2])
 {
     int i = 1;

vp9/encoder/vp9_onyx_if.c

diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 0ac9d5f..2f13814 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -906,7 +906,9 @@
   cpi->ext_refresh_frame_context_pending = 0;
 }
 
+#ifndef M_LOG2_E
 #define M_LOG2_E 0.693147180559945309417
+#endif
 #define log2f(x) (log (x) / (float) M_LOG2_E)
 
 static void cal_nmvjointsadcost(int *mvjointsadcost) {