[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 860e2c9924307cc58cc31cebaa446bcaa3a0f85c
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 1 05:47:37 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@64435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a2f3827..10a647e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 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>
+
         Reviewed by Darin Adler.
 
         <rdar://problem/8234766> Add WOFF support for @font-face
diff --git a/WebCore/platform/graphics/WOFFFileFormat.cpp b/WebCore/platform/graphics/WOFFFileFormat.cpp
index 8342428..2ceefca 100644
--- a/WebCore/platform/graphics/WOFFFileFormat.cpp
+++ b/WebCore/platform/graphics/WOFFFileFormat.cpp
@@ -29,13 +29,14 @@
 #if !ENABLE(OPENTYPE_SANITIZER)
 
 #include "SharedBuffer.h"
-#include "SoftLinking.h"
-#include <zlib.h>
 
-#if PLATFORM(WIN)
+#if !PLATFORM(WIN)
+#include <zlib.h>
+#else
+#include "SoftLinking.h"
 
 SOFT_LINK_LIBRARY(zlib1);
-SOFT_LINK(zlib1, uncompress, int, __cdecl, (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen), (dest, destLen, source, sourceLen));
+ (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