[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit ae5acd6adf459feb375416ff62abf9710e577560
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 20:03:33 2010 +0000

    Add a PLATFORM(WIN) check for NO_ERROR, attempted build fix
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index d7406c9..b7be8fc 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -33,7 +33,7 @@
 #include <wtf/PassOwnPtr.h>
 
 // FIXME: Find a better way to avoid the name confliction for NO_ERROR.
-#if PLATFORM(CHROMIUM) && OS(WINDOWS)
+#if ((PLATFORM(CHROMIUM) && OS(WINDOWS)) || PLATFORM(WIN))
 #undef NO_ERROR
 #endif
 

-- 
WebKit Debian packaging