29 lines
1.0 KiB
C++
29 lines
1.0 KiB
C++
$NetBSD: patch-mozilla_xpcom_build_XPCOMInit.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $
|
|
|
|
--- mozilla/xpcom/build/XPCOMInit.cpp.orig 2015-06-08 17:49:33.000000000 +0000
|
|
+++ mozilla/xpcom/build/XPCOMInit.cpp
|
|
@@ -141,7 +141,9 @@ extern nsresult nsStringInputStreamConst
|
|
#include "mozilla/VisualEventTracer.h"
|
|
#endif
|
|
|
|
+#ifndef MOZ_OGG_NO_MEM_REPORTING
|
|
#include "ogg/ogg.h"
|
|
+#endif
|
|
#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
|
|
@@ -669,11 +671,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul
|
|
// this oddness.
|
|
mozilla::SetICUMemoryFunctions();
|
|
|
|
+#ifndef MOZ_OGG_NO_MEM_REPORTING
|
|
// Do the same for libogg.
|
|
ogg_set_mem_functions(OggReporter::CountingMalloc,
|
|
OggReporter::CountingCalloc,
|
|
OggReporter::CountingRealloc,
|
|
OggReporter::CountingFree);
|
|
+#endif
|
|
|
|
#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
|
|
// And for VPX.
|