[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ab1328b47fe81d234c8916bad24ff6f9a1cc510d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 9 09:35:03 2010 +0000

    2010-02-09  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Laszlo Gombos.
    
            [BREWMP] Fix macro redefinition error in BREWMP simulator build.
            https://bugs.webkit.org/show_bug.cgi?id=34738
    
            Remove warning: 'FAR' macro redefinition.
    
            * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54537 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a73fba6..e0796c3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-09  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Laszlo Gombos.
+
+        [BREWMP] Fix macro redefinition error in BREWMP simulator build.
+        https://bugs.webkit.org/show_bug.cgi?id=34738
+
+        Remove warning: 'FAR' macro redefinition.
+
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+
 2010-02-07  Yuzo Fujishima  <yuzo at google.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index 2a2636a..aaa9047 100644
--- a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -41,7 +41,7 @@
 #include "JPEGImageDecoder.h"
 #include <stdio.h>  // Needed by jpeglib.h for FILE.
 
-#if OS(WINCE)
+#if OS(WINCE) || PLATFORM(BREWMP_SIMULATOR)
 // Remove warning: 'FAR' macro redefinition
 #undef FAR
 

-- 
WebKit Debian packaging