Title: [87447] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87446 => 87447)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-26 23:14:26 UTC (rev 87446)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-26 23:17:05 UTC (rev 87447)
@@ -1,5 +1,21 @@
2011-05-26 Lucas Forschler <[email protected]>
+ Merge r87225.
+
+ 2011-05-24 Mark Rowe <[email protected]>
+
+ Fix the 32-bit build.
+
+ Explicitly use uint32_t when encoding / decoding a type that is a typedef of OSType,
+ as this is declared as different underlying types in 32- and 64-bit (unsigned long
+ vs unsigned int).
+
+ * Shared/mac/KeychainAttribute.cpp:
+ (CoreIPC::encode):
+ (CoreIPC::decode):
+
+2011-05-26 Lucas Forschler <[email protected]>
+
Merge r87221.
2011-05-24 Brady Eidson <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/Shared/mac/KeychainAttribute.cpp (87446 => 87447)
--- branches/safari-534-branch/Source/WebKit2/Shared/mac/KeychainAttribute.cpp 2011-05-26 23:14:26 UTC (rev 87446)
+++ branches/safari-534-branch/Source/WebKit2/Shared/mac/KeychainAttribute.cpp 2011-05-26 23:17:05 UTC (rev 87447)
@@ -51,7 +51,7 @@
void encode(CoreIPC::ArgumentEncoder* encoder, const WebKit::KeychainAttribute& attribute)
{
- encoder->encodeUInt32(attribute.tag);
+ encoder->encodeUInt32(static_cast<uint32_t>(attribute.tag));
encoder->encodeBool(attribute.data);
if (attribute.data)
CoreIPC::encode(encoder, attribute.data.get());
@@ -59,9 +59,12 @@
bool decode(CoreIPC::ArgumentDecoder* decoder, WebKit::KeychainAttribute& attribute)
{
- if (!decoder->decodeUInt32(attribute.tag))
+ uint32_t tag;
+ if (!decoder->decodeUInt32(tag))
return false;
-
+
+ attribute.tag = tag;
+
bool expectData;
if (!decoder->decodeBool(expectData))
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
