01_outside-speex.patch (947B)
1 diff --git a/src/speex_resampler.h b/src/speex_resampler.h 2 --- a/src/speex_resampler.h 3 +++ b/src/speex_resampler.h 4 @@ -34,24 +34,25 @@ 5 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 6 POSSIBILITY OF SUCH DAMAGE. 7 */ 8 9 10 #ifndef SPEEX_RESAMPLER_H 11 #define SPEEX_RESAMPLER_H 12 13 -#ifdef OUTSIDE_SPEEX 14 +#if 1 /* OUTSIDE_SPEEX */ 15 16 /********* WARNING: MENTAL SANITY ENDS HERE *************/ 17 18 /* If the resampler is defined outside of Speex, we change the symbol names so that 19 there won't be any clash if linking with Speex later on. */ 20 21 /* #define RANDOM_PREFIX your software name here */ 22 +#define RANDOM_PREFIX moz_speex 23 #ifndef RANDOM_PREFIX 24 #error "Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes" 25 #endif 26 27 #define CAT_PREFIX2(a,b) a ## b 28 #define CAT_PREFIX(a,b) CAT_PREFIX2(a, b) 29 30 #define speex_resampler_init CAT_PREFIX(RANDOM_PREFIX,_resampler_init)