summaryrefslogtreecommitdiff
path: root/www/libxul/files/patch-bug778078
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-06-04 15:47:49 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-06-04 15:47:49 +0000
commit96b39667d354296d9907781fc508aaf7849a21be (patch)
treebc0f5b36fc5a70cd40b8c78438424de36296939f /www/libxul/files/patch-bug778078
parentConvert to new options framework (diff)
Update to 17.0.6 (this should also fix the build on head after the
clang 3.3 merge) PR: ports/179034 [1] Submitted by: Jan Beich <jbeich@tormail.org>, Nikolai Lifanov <lifanov@mail.lifanov.com> [1]
Notes
Notes: svn path=/head/; revision=319872
Diffstat (limited to 'www/libxul/files/patch-bug778078')
-rw-r--r--www/libxul/files/patch-bug77807814
1 files changed, 7 insertions, 7 deletions
diff --git a/www/libxul/files/patch-bug778078 b/www/libxul/files/patch-bug778078
index a68f07ab34ed..f7bedeb8053c 100644
--- a/www/libxul/files/patch-bug778078
+++ b/www/libxul/files/patch-bug778078
@@ -1,11 +1,11 @@
--- toolkit/xre/nsAppRunner.cpp~
+++ toolkit/xre/nsAppRunner.cpp
-@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n
- gQtOnlyArgv[gQtOnlyArgc] = nsnull;
- #endif
- #if defined(MOZ_WIDGET_GTK2)
+@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
+ ScopedLogging log;
+
+ #if defined(MOZ_WIDGET_GTK)
-#ifdef MOZ_MEMORY
+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
+ // Disable the slice allocator, since jemalloc already uses similar layout
+ // algorithms, and using a sub-allocator tends to increase fragmentation.
+ // This must be done before g_thread_init() is called.