mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-01 14:45:29 +00:00
af2b2bd42d
Instead of defining OUTSIDE_SPEEX and RANDOM_PREFIX everywhere speex_resampler.h is included, it is easier to patch the header. Symbol names in gkmedias symbols.def are updated now that RANDOM_PREFIX is taking effect, and unused symbols are no longer exported. --HG-- extra : transplant_source : sx%C9%ED%EB%E7%D8P%09%18%87%D4Oj%85%D5%25%C8%A5%01
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
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)
|