wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

For some wacky reason, jsuint gets assigned different types in TabParent.cpp on MSVC and this gives a linker error

Browse Source
This commit is contained in:
Luke Wagner 2010-07-05 04:11:33 -07:00
parent 549c391960
commit 86eab7cd9a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsarray.cpp
View File

@ -3229,7 +3229,7 @@ js_CoerceArrayToCanvasImageData(JSObject *obj, jsuint offset, jsuint count,
}
JS_FRIEND_API(JSObject *)
js_NewArrayObjectWithCapacity(JSContext *cx, jsuint capacity, jsval **vector)
js_NewArrayObjectWithCapacity(JSContext *cx, uint32 capacity, jsval **vector)
{
JSObject *obj = js_NewArrayObject(cx, capacity, NULL);
if (!obj)

5
js/src/jsarray.h
View File

@ -45,7 +45,6 @@
#include "jsprvtd.h"
#include "jspubtd.h"
#include "jsobj.h"
#include "jsatom.h"
#define ARRAY_CAPACITY_MIN 7
@ -64,7 +63,7 @@ js_IdIsIndex(jsid id, jsuint *indexp)
return JS_TRUE;
}
if (JS_UNLIKELY(!JSID_IS_ATOM(id)))
if (JS_UNLIKELY(!JSID_IS_STRING(id)))
return JS_FALSE;
return js_StringIsIndex(JSID_TO_STRING(id), indexp);
@ -255,7 +254,7 @@ js_Array(JSContext* cx, JSObject* obj, uintN argc, js::Value* argv, js::Value* r
* resulting array has length and count both equal to |capacity|.
*/
JS_FRIEND_API(JSObject *)
js_NewArrayObjectWithCapacity(JSContext *cx, jsuint capacity, jsval **vector);
js_NewArrayObjectWithCapacity(JSContext *cx, uint32 capacity, jsval **vector);
/*
* Makes a fast clone of a dense array as long as the array only contains