Fix 64-bit debug build.

Reviewed by Kevin Decker.

* platform/text/mac/TextCodecMac.cpp:
(WebCore::TextCodecMac::decode): OSStatus is a long for 32-bit but int on 64-bit,
so we need to cast it to be able to use a single format specifier on both.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28456 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 81ccffa8b40607663ca46f07edac03a95a736852..9f4c2c1896492f21f09fd130f1f4e2ace5c1e94e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-05  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        Fix 64-bit debug build.
+
+        * platform/text/mac/TextCodecMac.cpp:
+        (WebCore::TextCodecMac::decode): OSStatus is a long for 32-bit but int on 64-bit,
+        so we need to cast it to be able to use a single format specifier on both.
+
 2007-12-05  Kevin Decker  <kdecker@apple.com>
 
         Reviewed by Hyatt.

diff --git a/WebCore/platform/text/mac/TextCodecMac.cpp b/WebCore/platform/text/mac/TextCodecMac.cpp
index b233e66131861a3752ec164035bf472410552b0d..880ed5783b53831556636e7b58c3c580517e66c1 100644 (file)
--- a/WebCore/platform/text/mac/TextCodecMac.cpp
+++ b/WebCore/platform/text/mac/TextCodecMac.cpp
@@ -236,7 +236,7 @@ String TextCodecMac::decode(const char* bytes, size_t length, bool flush)
                 break;
             }
             default:
-                LOG_ERROR("text decoding failed with error %zu", status);
+                LOG_ERROR("text decoding failed with error %ld", static_cast<long>(status));
                 m_error = true;
                 return String();
         }