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

[demarchi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ce85f3bbdee2121f6e1c45d852dafccf7867a506
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 17:52:42 2010 +0000

    2010-09-23  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Csaba Osztrogonác.
    
            Fix warnings regarding print format in 64 bits
            https://bugs.webkit.org/show_bug.cgi?id=46357
    
            Use inttypes.h in order to have portable print formats across 32 and
            64 bits.
    
            * platform/sql/SQLiteFileSystem.cpp:
            (WebCore::SQLiteFileSystem::getFileNameForNewDatabase):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9ef07e9..8d3ba28 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-23  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Fix warnings regarding print format in 64 bits
+        https://bugs.webkit.org/show_bug.cgi?id=46357
+
+        Use inttypes.h in order to have portable print formats across 32 and
+        64 bits.
+
+        * platform/sql/SQLiteFileSystem.cpp:
+        (WebCore::SQLiteFileSystem::getFileNameForNewDatabase):
+
 2010-09-23  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/sql/SQLiteFileSystem.cpp b/WebCore/platform/sql/SQLiteFileSystem.cpp
index c9583eb..d487b95 100644
--- a/WebCore/platform/sql/SQLiteFileSystem.cpp
+++ b/WebCore/platform/sql/SQLiteFileSystem.cpp
@@ -28,12 +28,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define __STDC_FORMAT_MACROS
 #include "config.h"
 #include "SQLiteFileSystem.h"
 
 #include "FileSystem.h"
 #include "SQLiteDatabase.h"
 #include "SQLiteStatement.h"
+#include <inttypes.h>
 #include <sqlite3.h>
 
 namespace WebCore {
@@ -73,10 +75,10 @@ String SQLiteFileSystem::getFileNameForNewDatabase(const String& dbDir, const St
     String fileName;
     do {
         ++seq;
-        fileName = pathByAppendingComponent(dbDir, String::format("%016llx.db", seq));
+        fileName = pathByAppendingComponent(dbDir, String::format("%016"PRIx64".db", seq));
     } while (fileExists(fileName));
 
-    return String::format("%016llx.db", seq);
+    return String::format("%016"PRIx64".db", seq);
 }
 
 String SQLiteFileSystem::appendDatabaseFileNameToPath(const String& path, const String& fileName)

-- 
WebKit Debian packaging