media/libspeex_resampler/outside-speex.patch
author Wes Kocher <wkocher@mozilla.com>
Wed, 09 Mar 2016 10:56:23 -0800
changeset 287518 e26f9e5f41cd58d934a00719ca2646ddc1fa4964
parent 192469 0f1cea1a1a952c84d2a5758dbf9efc3ee6fe5dfc
child 346987 c8df499e005abc1438c394dfa72257e369097d7d
permissions -rw-r--r--
Backed out changeset 7cbab9ec76d5 (bug 1254689) for browser_dbg_addon-sources.js failures MozReview-Commit-ID: 3zPliH7mmPj

diff --git a/media/libspeex_resampler/src/speex_resampler.h b/media/libspeex_resampler/src/speex_resampler.h
--- a/media/libspeex_resampler/src/speex_resampler.h
+++ b/media/libspeex_resampler/src/speex_resampler.h
@@ -34,24 +34,25 @@
    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
 */
 
 
 #ifndef SPEEX_RESAMPLER_H
 #define SPEEX_RESAMPLER_H
 
-#ifdef OUTSIDE_SPEEX
+#if 1 /* OUTSIDE_SPEEX */
 
 /********* WARNING: MENTAL SANITY ENDS HERE *************/
 
 /* If the resampler is defined outside of Speex, we change the symbol names so that 
    there won't be any clash if linking with Speex later on. */
 
 /* #define RANDOM_PREFIX your software name here */
+#define RANDOM_PREFIX moz_speex
 #ifndef RANDOM_PREFIX
 #error "Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes"
 #endif
 
 #define CAT_PREFIX2(a,b) a ## b
 #define CAT_PREFIX(a,b) CAT_PREFIX2(a, b)
       
 #define speex_resampler_init CAT_PREFIX(RANDOM_PREFIX,_resampler_init)