From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 13 May 2011 16:23:25 +0100
Subject: Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
---
 Source/WebCore/ForwardingHeaders/runtime/Collector.h           | 4 ----
 Source/WebCore/ForwardingHeaders/runtime/Heap.h                | 4 ++++
 Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 Source/WebCore/ForwardingHeaders/runtime/Collector.h
 create mode 100644 Source/WebCore/ForwardingHeaders/runtime/Heap.h

(limited to 'Source/WebCore/ForwardingHeaders')

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Collector.h b/Source/WebCore/ForwardingHeaders/runtime/Collector.h
deleted file mode 100644
index d133a27..0000000
--- a/Source/WebCore/ForwardingHeaders/runtime/Collector.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_Collector_h
-#define WebCore_FWD_Collector_h
-#include <JavaScriptCore/Collector.h>
-#endif
diff --git a/Source/WebCore/ForwardingHeaders/runtime/Heap.h b/Source/WebCore/ForwardingHeaders/runtime/Heap.h
new file mode 100644
index 0000000..810fa3c
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Heap.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Heap_h
+#define WebCore_FWD_Heap_h
+#include <JavaScriptCore/Heap.h>
+#endif
diff --git a/Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h b/Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h
index bd4f735..ee1f856 100644
--- a/Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h
+++ b/Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h
@@ -1,4 +1,4 @@
-#ifndef WebCore_FWD_InitializeThreadingn_h
+#ifndef WebCore_FWD_InitializeThreading_h
 #define WebCore_FWD_InitializeThreading_h
 #include <JavaScriptCore/InitializeThreading.h>
 #endif
-- 
cgit v1.1