[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:37:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 20b7f8fe6de90d14966fcbea8fa495616145f83e
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Aug 1 05:53:32 2010 +0000
Fix typo in attempted build fix.
* platform/graphics/WOFFFileFormat.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 10a647e..f19339b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
2010-07-31 Dan Bernstein <mitz at apple.com>
+ Fix typo in attempted build fix.
+
+ * platform/graphics/WOFFFileFormat.cpp:
+
+2010-07-31 Dan Bernstein <mitz at apple.com>
+
Try to fix the Windows build when zlib is not available.
* platform/graphics/WOFFFileFormat.cpp:
diff --git a/WebCore/platform/graphics/WOFFFileFormat.cpp b/WebCore/platform/graphics/WOFFFileFormat.cpp
index 2ceefca..b0d9d67 100644
--- a/WebCore/platform/graphics/WOFFFileFormat.cpp
+++ b/WebCore/platform/graphics/WOFFFileFormat.cpp
@@ -36,7 +36,7 @@
#include "SoftLinking.h"
SOFT_LINK_LIBRARY(zlib1);
- (zlib1, uncompress, int, __cdecl, (Bytef *dest, uLongf *destLen, const Bytef *source, uLong 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
More information about the Pkg-webkit-commits
mailing list