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

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e473e91f0b403701e57e65cb8e64eb7d6cff3fe5
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 1 06:05:04 2010 +0000

    Try to fix the Windows build when zlib is not available.
    
    * platform/graphics/WOFFFileFormat.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7aaa95b..8a26c52 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -6,6 +6,12 @@
 
 2010-07-31  Dan Bernstein  <mitz at apple.com>
 
+        Try to fix the Windows build when zlib is not available.
+
+        * platform/graphics/WOFFFileFormat.cpp:
+
+2010-07-31  Dan Bernstein  <mitz at apple.com>
+
         Fix typo in attempted build fix.
 
         * platform/graphics/WOFFFileFormat.cpp:
diff --git a/WebCore/platform/graphics/WOFFFileFormat.cpp b/WebCore/platform/graphics/WOFFFileFormat.cpp
index 3df71ca..9e43062 100644
--- a/WebCore/platform/graphics/WOFFFileFormat.cpp
+++ b/WebCore/platform/graphics/WOFFFileFormat.cpp
@@ -35,8 +35,12 @@
 #else
 #include "SoftLinking.h"
 
+typedef unsigned char Bytef;
+typedef unsigned long uLong;
+typedef unsigned long uLongf;
+
 SOFT_LINK_LIBRARY(zlib1);
-SOFT_LINK(zlib1, uncompress, int, __cdecl, (unsigned char* dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen), (dest, destLen, source, sourceLen));
+SOFT_LINK(zlib1, uncompress, int, __cdecl, (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen), (dest, destLen, source, sourceLen));
 
 #if CPU(BIG_ENDIAN)
 #define ntohs(x) ((uint16_t)(x))

-- 
WebKit Debian packaging