[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d142169298f2b40ee35e78132e8fa4bb71e693d6
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 21:35:54 2010 +0000

    Fix for r68521 to build on VS2008/Release.
    
    Patch by Stephen White <senorblanco at chromium.org> on 2010-09-28
    Reviewed by Csaba Osztrogonác.
    
    * html/DocTypeStrings.gperf:
    Don't emit "#include <string.h>" here, since we're inside a namespace.
    * make-hash-tools.pl:
    Emit #include <string.h> manually where required.
    * platform/ColorData.gperf:
    Don't emit "#include <string.h>" here, since we're inside a namespace.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68563 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6cf1681..90b8a2f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-28  Stephen White  <senorblanco at chromium.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Fix for r68521 to build on VS2008/Release.
+
+        * html/DocTypeStrings.gperf:
+        Don't emit "#include <string.h>" here, since we're inside a namespace.
+        * make-hash-tools.pl:
+        Emit #include <string.h> manually where required.
+        * platform/ColorData.gperf:
+        Don't emit "#include <string.h>" here, since we're inside a namespace.
+
 2010-09-28  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/html/DocTypeStrings.gperf b/WebCore/html/DocTypeStrings.gperf
index 6b7da04..22488eb 100644
--- a/WebCore/html/DocTypeStrings.gperf
+++ b/WebCore/html/DocTypeStrings.gperf
@@ -9,7 +9,6 @@ struct PubIDInfo;
 %define initializer-suffix ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards
 %define lookup-function-name findDoctypeEntryImpl
 %define hash-function-name doctype_hash_function
-%includes
 %enum
 %%
 "+//silmaril//dtd html pro v0r11 19970101//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
diff --git a/WebCore/make-hash-tools.pl b/WebCore/make-hash-tools.pl
index a8c684d..3ad5ee9 100644
--- a/WebCore/make-hash-tools.pl
+++ b/WebCore/make-hash-tools.pl
@@ -97,6 +97,7 @@ case "DocTypeStrings" {
     print DOCTYPESTRINGS << "EOF";
 /* This file is automatically generated by make-hash-tools.pl, do not edit */
 
+#include <string.h>
 #include "HashTools.h"
 
 namespace WebCore {
@@ -127,6 +128,7 @@ case "ColorData" {
     print COLORDATA << "EOF";
 /* This file is automatically generated by make-hash-tools.pl, do not edit */
 
+#include <string.h>
 #include "HashTools.h"
 
 namespace WebCore {
diff --git a/WebCore/platform/ColorData.gperf b/WebCore/platform/ColorData.gperf
index d684cb9..dd726cc 100644
--- a/WebCore/platform/ColorData.gperf
+++ b/WebCore/platform/ColorData.gperf
@@ -8,7 +8,6 @@ struct NamedColor;
 %define class-name ColorDataHash
 %define lookup-function-name findColorImpl
 %define hash-function-name colordata_hash_function
-%includes
 %enum
 %%
 aliceblue, 0xf0f8ff

-- 
WebKit Debian packaging