From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 24 May 2011 11:24:40 +0100
Subject: Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
---
 Source/WebCore/platform/cf/RunLoopTimerCF.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/platform/cf')

diff --git a/Source/WebCore/platform/cf/RunLoopTimerCF.cpp b/Source/WebCore/platform/cf/RunLoopTimerCF.cpp
index e2754fb..f62299e 100644
--- a/Source/WebCore/platform/cf/RunLoopTimerCF.cpp
+++ b/Source/WebCore/platform/cf/RunLoopTimerCF.cpp
@@ -27,10 +27,11 @@
  */
 
 #include "config.h"
-#include "RunLoopTimer.h"
 
 #if PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)
 
+#include "RunLoopTimer.h"
+
 namespace WebCore {
 
 RunLoopTimerBase::~RunLoopTimerBase()
-- 
cgit v1.1