Import of pkgsrc-2015Q3
This commit is contained in:
28
www/firefox38/patches/patch-xpcom_build_XPCOMInit.cpp
Normal file
28
www/firefox38/patches/patch-xpcom_build_XPCOMInit.cpp
Normal file
@@ -0,0 +1,28 @@
|
||||
$NetBSD: patch-xpcom_build_XPCOMInit.cpp,v 1.1 2015/07/09 14:13:52 ryoon Exp $
|
||||
|
||||
--- xpcom/build/XPCOMInit.cpp.orig 2015-05-04 00:43:36.000000000 +0000
|
||||
+++ 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.
|
||||
Reference in New Issue
Block a user