summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/ForwardingHeaders
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-13 16:23:25 +0100
committerBen Murdoch <benm@google.com>2011-05-16 11:35:02 +0100
commit65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch)
treef478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/ForwardingHeaders
parent47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff)
downloadexternal_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/ForwardingHeaders')
-rw-r--r--Source/WebCore/ForwardingHeaders/runtime/Collector.h4
-rw-r--r--Source/WebCore/ForwardingHeaders/runtime/Heap.h4
-rw-r--r--Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h2
3 files changed, 5 insertions, 5 deletions
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