[INFER] Fix x64 build, revert accidental manifest.py changes, bug 639099.

This commit is contained in:
Brian Hackett 2011-03-26 19:56:49 -07:00
parent 74bba0be53
commit 94473000bc
2 changed files with 9 additions and 3 deletions

View File

@ -61,6 +61,10 @@ namespace mjit { struct JITScript; }
struct VMFrame
{
union Arguments {
struct {
void *ptr;
void *ptr2;
} x;
struct {
uint32 lazyArgsObj;
uint32 dynamicArgc;
@ -452,13 +456,13 @@ ExpandInlineFrames(JSContext *cx, bool all);
struct UnsyncedEntry
{
// Slot being updated, in bytes from the start of the outer JSStackFrame.
uint32 offset;
int32 offset;
bool copy : 1;
bool constant : 1;
bool knownType : 1;
union {
uint32 copiedOffset;
int32 copiedOffset;
Value value;
JSValueType type;
} u;

View File

@ -72,8 +72,10 @@ class XULInfoTester:
out, err = p.communicate()
if out in ('true\n', 'true\r\n'):
ans = True
else:
elif out in ('false\n', 'false\r\n'):
ans = False
else:
raise Exception("Failed to test XUL condition '%s'"%cond)
self.cache[cond] = ans
return ans