diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2016-10-04 09:41:52 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2016-10-04 09:41:52 -0400 |
| commit | 2681eea9de654c9cc39031017157fc8de39e7101 (patch) | |
| tree | 7d3ac07867cf9eeec8b23cc7a91edcf941215a0c /xpcom/build | |
| parent | 9362611ce7b6a2bf14c8ea7d784046238be114af (diff) | |
| download | palemoon-gre-2681eea9de654c9cc39031017157fc8de39e7101.tar.gz | |
Issue #546 - Update Tycho to libvpx 1.4 - Part 3: Clean up now unused vpx memory function mangling from XPCOMInit and bump libvpx version to 1.4.0 in configure
Diffstat (limited to 'xpcom/build')
| -rw-r--r-- | xpcom/build/XPCOMInit.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index 04439139a..291ab328a 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -142,15 +142,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); #endif #include "ogg/ogg.h" -#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) -#if defined(HAVE_STDINT_H) -// mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -// vpx_config.h (which we include via vpx_mem.h, below). This redefinition -// triggers a build warning on MSVC, so we have to #undef it first. -#undef HAVE_STDINT_H -#endif -#include "vpx_mem/vpx_mem.h" -#endif + #ifdef MOZ_WEBM #include "nestegg/nestegg.h" #endif @@ -686,17 +678,6 @@ NS_InitXPCOM2(nsIServiceManager** aResult, OggReporter::CountingRealloc, OggReporter::CountingFree); -#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. - vpx_mem_set_functions(VPXReporter::CountingMalloc, - VPXReporter::CountingCalloc, - VPXReporter::CountingRealloc, - VPXReporter::CountingFree, - memcpy, - memset, - memmove); -#endif - #ifdef MOZ_WEBM // And for libnestegg. // libnestegg expects that its realloc implementation will free |