From 17649d8f9c6e431b2c36eab328aab6e7541d7077 Mon Sep 17 00:00:00 2001
From: "wingo@igalia.com"
 <wingo@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 4 Jul 2012 20:32:26 +0000
Subject: [PATCH] [GTK] Enable parallel GC
 https://bugs.webkit.org/show_bug.cgi?id=90568

Reviewed by Martin Robinson.

Source/JavaScriptCore:

* runtime/Options.cpp: Include <algorithm.h> for std::min.

Source/WTF:

* wtf/Platform.h: Add GTK to the ENABLE_PARALLEL_GC party.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121869 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Source/JavaScriptCore/ChangeLog           | 9 +++++++++
 Source/JavaScriptCore/runtime/Options.cpp | 1 +
 Source/WTF/ChangeLog                      | 9 +++++++++
 Source/WTF/wtf/Platform.h                 | 2 +-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index cfe5855..51fb324 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-04  Andy Wingo  <wingo@igalia.com>
+
+        [GTK] Enable parallel GC
+        https://bugs.webkit.org/show_bug.cgi?id=90568
+
+        Reviewed by Martin Robinson.
+
+        * runtime/Options.cpp: Include <algorithm.h> for std::min.
+
 2012-07-04  John Mellor  <johnme@chromium.org>
 
         Text Autosizing: Add compile flag and runtime setting
diff --git a/Source/JavaScriptCore/runtime/Options.cpp b/Source/JavaScriptCore/runtime/Options.cpp
index 3400098..17743d3 100644
--- a/Source/JavaScriptCore/runtime/Options.cpp
+++ b/Source/JavaScriptCore/runtime/Options.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "Options.h"
 
+#include <algorithm>
 #include <limits>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 4925794..4bcf3f8 100644
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-04  Andy Wingo  <wingo@igalia.com>
+
+        [GTK] Enable parallel GC
+        https://bugs.webkit.org/show_bug.cgi?id=90568
+
+        Reviewed by Martin Robinson.
+
+        * wtf/Platform.h: Add GTK to the ENABLE_PARALLEL_GC party.
+
 2012-07-04  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Get rid of un-needed QT += declarative for Qt 5
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 75a9a86..9a7c75c 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1075,7 +1075,7 @@
 
 #define ENABLE_OBJECT_MARK_LOGGING 0
 
-#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || PLATFORM(BLACKBERRY)) && ENABLE(COMPARE_AND_SWAP)
+#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || PLATFORM(BLACKBERRY) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
 #define ENABLE_PARALLEL_GC 1
 #endif
 
-- 
2.7.4