From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Mon, 28 Jun 2010 16:42:48 +0100
Subject: Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
---
 WebCore/platform/ThreadTimers.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebCore/platform/ThreadTimers.h')

diff --git a/WebCore/platform/ThreadTimers.h b/WebCore/platform/ThreadTimers.h
index 01b4c71..ab42598 100644
--- a/WebCore/platform/ThreadTimers.h
+++ b/WebCore/platform/ThreadTimers.h
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ThreadTimer_h
-#define ThreadTimer_h
+#ifndef ThreadTimers_h
+#define ThreadTimers_h
 
 #include <wtf/Noncopyable.h>
 #include <wtf/HashSet.h>
-- 
cgit v1.1