[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 d101da45f21bfb9659b86058f010f7fe72395a87
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 20:28:18 2010 +0000

    2010-08-12  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix warnings: unknown conversion type character 'l' in format
            https://bugs.webkit.org/show_bug.cgi?id=43359
    
            Qt port doesn't call any printf in String::format(...), consequently
            using __attribute__((format(printf,m,n))) is incorrect and causes
            false positive warnings on Windows if you build with MinGW.
    
            Qt port calls QString::vsprintf(...) , which is platform
            independent, and handles %lli, %llu and %llx on all platforms.
            (http://trac.webkit.org/changeset/35712)
    
            * wtf/text/WTFString.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65264 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 49a3e8c..bbc9c90 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-12  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix warnings: unknown conversion type character 'l' in format
+        https://bugs.webkit.org/show_bug.cgi?id=43359
+
+        Qt port doesn't call any printf in String::format(...), consequently
+        using __attribute__((format(printf,m,n))) is incorrect and causes
+        false positive warnings on Windows if you build with MinGW.
+
+        Qt port calls QString::vsprintf(...) , which is platform
+        independent, and handles %lli, %llu and %llx on all platforms.
+        (http://trac.webkit.org/changeset/35712)
+
+        * wtf/text/WTFString.h:
+
 2010-08-12  Gabor Loki  <loki at webkit.org>
 
         Reviewed by Geoffrey Garen.
diff --git a/JavaScriptCore/wtf/text/WTFString.h b/JavaScriptCore/wtf/text/WTFString.h
index 6af519c..4921d18 100644
--- a/JavaScriptCore/wtf/text/WTFString.h
+++ b/JavaScriptCore/wtf/text/WTFString.h
@@ -201,8 +201,12 @@ public:
     static String number(long long);
     static String number(unsigned long long);
     static String number(double);
-    
+
+#if !PLATFORM(QT)
     static String format(const char *, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
+#else
+    static String format(const char *, ...);
+#endif
 
     // Returns an uninitialized string. The characters needs to be written
     // into the buffer returned in data before the returned string is used.

-- 
WebKit Debian packaging