[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 11:56:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 45b83e8421354d30de8a6be98cba9633c31a22ee
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 18:59:28 2010 +0000
2010-08-11 Adam Barth <abarth at webkit.org>
Windows build fix. Turns out we need to unconditionally include
HTMLEntityNames.cpp now that LegacyHTMLDocumentParser doesn't exist.
* html/HTMLEntityParser.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65171 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0531842..8e0c565 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-11 Adam Barth <abarth at webkit.org>
+
+ Windows build fix. Turns out we need to unconditionally include
+ HTMLEntityNames.cpp now that LegacyHTMLDocumentParser doesn't exist.
+
+ * html/HTMLEntityParser.cpp:
+
2010-08-11 Eric Carlson <eric.carlson at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/html/HTMLEntityParser.cpp b/WebCore/html/HTMLEntityParser.cpp
index b9c4dee..6bec819 100644
--- a/WebCore/html/HTMLEntityParser.cpp
+++ b/WebCore/html/HTMLEntityParser.cpp
@@ -30,18 +30,7 @@
#include <wtf/Vector.h>
-// Use __GNUC__ instead of PLATFORM(GCC) to stay consistent with the gperf generated c file
-#ifdef __GNUC__
-// The main parser includes this too so we are getting two copies of the data. However, this way the code gets inlined.
#include "HTMLEntityNames.cpp"
-#else
-// Not inlined for non-GCC compilers
-struct Entity {
- const char* name;
- int code;
-};
-const struct Entity* findEntity(register const char* str, register unsigned int len);
-#endif
using namespace WTF;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list