Bug 708735 - Merge m-c into m-i to fix Windows bustage in a CLOSED TREE. r=bustage

This commit is contained in:
Jeff Walden 2011-12-16 09:54:30 -05:00
commit 76af5e9b06
3 changed files with 5 additions and 5 deletions

View File

@ -94,7 +94,7 @@ ConvertCloneReadInfosToArrayInternal(
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
}
for (uint32 index = 0, count = aReadInfos.Length(); index < count;
for (uint32_t index = 0, count = aReadInfos.Length(); index < count;
index++) {
StructuredCloneReadInfo& readInfo = aReadInfos[index];

View File

@ -943,8 +943,8 @@ StructuredCloneReadString(JSStructuredCloneReader* aReader,
JSObject*
IDBObjectStore::StructuredCloneReadCallback(JSContext* aCx,
JSStructuredCloneReader* aReader,
uint32 aTag,
uint32 aData,
uint32_t aTag,
uint32_t aData,
void* aClosure)
{
if (aTag == SCTAG_DOM_BLOB || aTag == SCTAG_DOM_FILE) {

View File

@ -118,8 +118,8 @@ public:
static JSObject*
StructuredCloneReadCallback(JSContext* aCx,
JSStructuredCloneReader* aReader,
uint32 aTag,
uint32 aData,
uint32_t aTag,
uint32_t aData,
void* aClosure);
static JSBool
StructuredCloneWriteCallback(JSContext* aCx,