[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
mitz at apple.com
mitz at apple.com
Wed Apr 7 23:14:17 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit d301dc3d9f37bd1c979e78dfd56212aaf8e1c744
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 29 07:12:57 2009 +0000
Tiger build fix after r50259
* platform/graphics/mac/ComplexTextControllerATSUI.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50263 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 15641aa..333d59b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-29 Dan Bernstein <mitz at apple.com>
+
+ Tiger build fix after r50259
+
+ * platform/graphics/mac/ComplexTextControllerATSUI.cpp:
+
2009-10-28 Steve Falkenburg <sfalken at apple.com>
Rubber stamped by Mark Rowe.
diff --git a/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp b/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
index 7da1737..b784433 100644
--- a/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
+++ b/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
@@ -29,6 +29,14 @@
#include "Font.h"
#include "ShapeArabic.h"
+#ifdef BUILDING_ON_TIGER
+#ifdef __LP64__
+#define URefCon void*
+#else
+#define URefCon UInt32
+#endif
+#endif
+
using namespace WTF::Unicode;
namespace WebCore {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list