[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 378655f26db11a6650eb4e1aff03e7b63e8e836a
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 8 22:27:23 2010 +0000

    2010-08-08  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [Qt] Fix warnings in WebCore/platform/WindowsKeyboardCodes.h
            https://bugs.webkit.org/show_bug.cgi?id=43360
    
            * platform/WindowsKeyboardCodes.h: Undef macros which are also defined in MinGW/include/winuser.h to aviod gcc redefinition warning
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b038b7f..6ad106d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-08  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Fix warnings in WebCore/platform/WindowsKeyboardCodes.h
+        https://bugs.webkit.org/show_bug.cgi?id=43360
+
+        * platform/WindowsKeyboardCodes.h: Undef macros which are also defined in MinGW/include/winuser.h to aviod gcc redefinition warning
+
 2010-08-08  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/WindowsKeyboardCodes.h b/WebCore/platform/WindowsKeyboardCodes.h
index 86c77ea..2d287c2 100644
--- a/WebCore/platform/WindowsKeyboardCodes.h
+++ b/WebCore/platform/WindowsKeyboardCodes.h
@@ -27,6 +27,36 @@
 
 #define VK_UNKNOWN 0
 
+// Undef macros which are also defined in MinGW/include/winuser.h to aviod gcc redefinition warning
+// https://bugs.webkit.org/show_bug.cgi?id=43360
+#if COMPILER(MINGW)
+#undef VK_BACK
+#undef VK_TAB
+#undef VK_CLEAR
+#undef VK_RETURN
+#undef VK_SHIFT
+#undef VK_CONTROL
+#undef VK_MENU
+#undef VK_PAUSE
+#undef VK_CAPITAL
+#undef VK_SPACE
+#undef VK_PRIOR
+#undef VK_NEXT
+#undef VK_END
+#undef VK_HOME
+#undef VK_LEFT
+#undef VK_UP
+#undef VK_RIGHT
+#undef VK_DOWN
+#undef VK_SELECT
+#undef VK_PRINT
+#undef VK_EXECUTE
+#undef VK_SNAPSHOT
+#undef VK_INSERT
+#undef VK_DELETE
+#undef VK_HELP
+#endif // COMPILER(MINGW)
+
 // Left mouse button
 // Right mouse button
 // Control-break processing

-- 
WebKit Debian packaging