summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/cf
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-11 17:01:47 +0100
committerBen Murdoch <benm@google.com>2009-08-11 18:21:02 +0100
commit0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch)
tree2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/cf
parent7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff)
downloadexternal_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/cf')
-rw-r--r--WebCore/platform/cf/RunLoopTimerCF.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/cf/RunLoopTimerCF.cpp b/WebCore/platform/cf/RunLoopTimerCF.cpp
index c97dd21..e2754fb 100644
--- a/WebCore/platform/cf/RunLoopTimerCF.cpp
+++ b/WebCore/platform/cf/RunLoopTimerCF.cpp
@@ -29,7 +29,7 @@
#include "config.h"
#include "RunLoopTimer.h"
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)
namespace WebCore {
@@ -81,4 +81,4 @@ bool RunLoopTimerBase::isActive() const
} // namespace WebCore
-#endif
+#endif // PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)