From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 2 Jun 2011 12:07:03 +0100
Subject: Merge WebKit at r84325: Initial merge by git.

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

(limited to 'Source/WebCore/platform/FloatConversion.h')

diff --git a/Source/WebCore/platform/FloatConversion.h b/Source/WebCore/platform/FloatConversion.h
index 655ab44..fb76833 100644
--- a/Source/WebCore/platform/FloatConversion.h
+++ b/Source/WebCore/platform/FloatConversion.h
@@ -29,7 +29,7 @@
 #ifndef FloatConversion_h
 #define FloatConversion_h
 
-#if PLATFORM(CG)
+#if USE(CG)
 #include <CoreGraphics/CGBase.h>
 #endif
 
@@ -44,7 +44,7 @@ namespace WebCore {
         return static_cast<float>(number);
     }
 
-#if PLATFORM(CG)
+#if USE(CG)
     template<typename T>
     CGFloat narrowPrecisionToCGFloat(T);
 
-- 
cgit v1.1