2006-09-26 Graham Dennis <graham.dennis@gmail.com>

        Reviewed by mitzpettel.

        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=11020
        No-SVG build broken since r16549

        Change #if SVG_SUPPORT to #ifdef SVG_SUPPORT

        * css/cssparser.cpp:
        (WebCore::CSSParser::parseValue):
        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::applyProperty):
        * page/FrameView.cpp:
        (WebCore::selectCursor):
        * platform/qt/GraphicsContextQt.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16571 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 89ce57d6a1894907c9e2a42eb815918eb0b95f64..8e09327f22546fb5648acc7094b5609586111c56 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2006-09-26  Graham Dennis  <graham.dennis@gmail.com>
+
+        Reviewed by mitzpettel.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=11020
+        No-SVG build broken since r16549
+        
+        Change #if SVG_SUPPORT to #ifdef SVG_SUPPORT
+
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * page/FrameView.cpp:
+        (WebCore::selectCursor):
+        * platform/qt/GraphicsContextQt.cpp:
+
 2006-09-26  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/css/cssparser.cpp b/WebCore/css/cssparser.cpp
index 8bcfe03e0f7336d36e5e2ebca910efdd64fdfaab..3377be9bb5776da46065a78ca0eea84658c338bd 100644 (file)
--- a/WebCore/css/cssparser.cpp
+++ b/WebCore/css/cssparser.cpp
@@ -718,7 +718,7 @@ bool CSSParser::parseValue(int propId, bool important)
             } else if(strict && nrcoords == 2)
                 hotspot = IntPoint(coords[0], coords[1]);
             if (strict || coords.size() == 0) {
-#if SVG_SUPPORT
+#ifdef SVG_SUPPORT
             if (uri.startsWith("#")) {
                 if (!list)
                     list = new CSSValueList; 

diff --git a/WebCore/css/cssstyleselector.cpp b/WebCore/css/cssstyleselector.cpp
index e5e2ce9fc0f1d75572be3bcf62275d0f4176fe87..f2dee0be9e5e947f8bdd71ca5c4a908e446aa0e9 100644 (file)
--- a/WebCore/css/cssstyleselector.cpp
+++ b/WebCore/css/cssstyleselector.cpp
@@ -2440,7 +2440,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
                 primitiveValue = static_cast<CSSPrimitiveValue*>(item);
                 int type = primitiveValue->primitiveType();
                 if (type == CSSPrimitiveValue::CSS_URI) {
-#if SVG_SUPPORT
+#ifdef SVG_SUPPORT
                     if (primitiveValue->getStringValue().find("#") == 0)
                         style->addSVGCursor(primitiveValue->getStringValue().substring(1));
                     else

diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index dda84f885bde7da2c6d9ba59ec765dc5e15221b4..a94bb3c71c0bfc95fca147a37c51ef7d1f00bb7a 100644 (file)
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -48,7 +48,7 @@
 #include "SelectionController.h"
 #include "cssstyleselector.h"
 
-#if SVG_SUPPORT
+#ifdef SVG_SUPPORT
 #include "XLinkNames.h"
 #include "SVGNames.h"
 #include "SVGCursorElement.h"
@@ -59,7 +59,7 @@ namespace WebCore {
 
 using namespace EventNames;
 using namespace HTMLNames;
-#if SVG_SUPPORT
+#ifdef SVG_SUPPORT
 using namespace SVGNames;
 #endif
 
@@ -661,7 +661,7 @@ static Cursor selectCursor(const MouseEventWithHitTestResults& event, Frame* fra
         for (unsigned i = 0; i < cursors->size(); ++i) {
             CachedImage* cimage = (*cursors)[i].cursorImage;
             IntPoint hotSpot = (*cursors)[i].hotSpot;
-#if SVG_SUPPORT
+#ifdef SVG_SUPPORT
             if (!cimage) {
                 Element* e = node->document()->getElementById((*cursors)[i].cursorFragmentId);
                 if (e && e->hasTagName(cursorTag)) {

diff --git a/WebCore/platform/qt/GraphicsContextQt.cpp b/WebCore/platform/qt/GraphicsContextQt.cpp
index 3fde7c41d8a0e9e555f353f76b6bfdf61873840f..e2b9b5800477ec357ce8fde893f6c88222f12f73 100644 (file)
--- a/WebCore/platform/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/qt/GraphicsContextQt.cpp
@@ -46,7 +46,7 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-#if SVG_SUPPORT
+#ifdef SVG_SUPPORT
 #include "KRenderingDeviceQt.h"
 #endif
 
@@ -777,7 +777,7 @@ void GraphicsContext::concatCTM(const AffineTransform& transform)
     m_data->p().setMatrix(transform, true);
 }
 
-#if SVG_SUPPORT
+#ifdef SVG_SUPPORT
 KRenderingDeviceContext* GraphicsContext::createRenderingDeviceContext()
 {
     return new KRenderingDeviceContextQt(platformContext());