[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mitz at apple.com
mitz at apple.com
Wed Dec 22 11:38:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 035154c71ed527241ef9fed58151f8817edca9a6
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Aug 1 06:12:12 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@64439 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8a26c52..c924cc4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -12,6 +12,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 9e43062..dc73603 100644
--- a/WebCore/platform/graphics/WOFFFileFormat.cpp
+++ b/WebCore/platform/graphics/WOFFFileFormat.cpp
@@ -38,6 +38,7 @@
typedef unsigned char Bytef;
typedef unsigned long uLong;
typedef unsigned long uLongf;
+#define Z_OK 0
SOFT_LINK_LIBRARY(zlib1);
SOFT_LINK(zlib1, uncompress, int, __cdecl, (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen), (dest, destLen, source, sourceLen));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list