[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 513b4fa36c510b5429ab75e2fc04b87c35daee4e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 20:12:40 2009 +0000

    2009-11-19  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Darin Adler.
    
            Remove HAVE(STRING_H) guard from JavaScriptCore
            https://bugs.webkit.org/show_bug.cgi?id=31668
    
            * config.h:
            * runtime/UString.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51199 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5057ab0..14a1290 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-19  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Remove HAVE(STRING_H) guard from JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=31668
+
+        * config.h:
+        * runtime/UString.cpp:
+
 2009-11-19  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/JavaScriptCore/config.h b/JavaScriptCore/config.h
index a6a6f0a..30757db 100644
--- a/JavaScriptCore/config.h
+++ b/JavaScriptCore/config.h
@@ -57,7 +57,6 @@
 
 /* FIXME: if all platforms have these, do they really need #defines? */
 #define HAVE_STDINT_H 1
-#define HAVE_STRING_H 1
 
 #define WTF_CHANGES 1
 
diff --git a/JavaScriptCore/runtime/UString.cpp b/JavaScriptCore/runtime/UString.cpp
index 257868d..50d23c4 100644
--- a/JavaScriptCore/runtime/UString.cpp
+++ b/JavaScriptCore/runtime/UString.cpp
@@ -35,6 +35,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
 #include <wtf/MathExtras.h>
@@ -43,9 +44,6 @@
 #include <wtf/unicode/UTF8.h>
 #include <wtf/StringExtras.h>
 
-#if HAVE(STRING_H)
-#include <string.h>
-#endif
 #if HAVE(STRINGS_H)
 #include <strings.h>
 #endif

-- 
WebKit Debian packaging