mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
29 lines
991 B
C++
29 lines
991 B
C++
$NetBSD: patch-mozilla_xpcom_build_nsXPComInit.cpp,v 1.1 2015/07/13 17:49:26 ryoon Exp $
|
|
|
|
--- mozilla/xpcom/build/nsXPComInit.cpp.orig 2014-07-18 00:05:57.000000000 +0000
|
|
+++ mozilla/xpcom/build/nsXPComInit.cpp
|
|
@@ -133,7 +133,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)
|
|
#include "vpx_mem/vpx_mem.h"
|
|
#endif
|
|
@@ -607,11 +609,13 @@ NS_InitXPCOM2(nsIServiceManager* *result
|
|
// 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.
|