Changeset 37997 in webkit for trunk/JavaScriptCore


Ignore:
Timestamp:
Oct 30, 2008, 3:45:36 AM (17 years ago)
Author:
[email protected]
Message:

2008-10-30 Alp Toker <​[email protected]>

Build fix attempt for older gcc on the trunk-mac-intel build bot
(error: initializer for scalar variable requires one element).

Modify the initializer syntax slightly with an additional comma.

  • VM/Machine.cpp: (JSC::Machine::cti_op_call_JSFunction): (JSC::Machine::cti_op_construct_JSConstruct): (JSC::Machine::cti_op_resolve_func): (JSC::Machine::cti_op_post_inc): (JSC::Machine::cti_op_resolve_with_base): (JSC::Machine::cti_op_post_dec):
Location:
trunk/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r37995 r37997  
     12008-10-30  Alp Toker  <[email protected]>
     2
     3        Build fix attempt for older gcc on the trunk-mac-intel build bot
     4        (error: initializer for scalar variable requires one element).
     5
     6        Modify the initializer syntax slightly with an additional comma.
     7
     8        * VM/Machine.cpp:
     9        (JSC::Machine::cti_op_call_JSFunction):
     10        (JSC::Machine::cti_op_construct_JSConstruct):
     11        (JSC::Machine::cti_op_resolve_func):
     12        (JSC::Machine::cti_op_post_inc):
     13        (JSC::Machine::cti_op_resolve_with_base):
     14        (JSC::Machine::cti_op_post_dec):
     15
    1162008-10-30  Alp Toker  <[email protected]>
    217

  • trunk/JavaScriptCore/VM/Machine.cpp

    r37995 r37997  
    43504350    do { \
    43514351        VM_THROW_EXCEPTION_AT_END(); \
    4352         VoidPtrPairValue pair = {{ 0, 0 }}; \
     4352        VoidPtrPairValue pair = {{ 0, 0 }, }; \
    43534353        return pair.i; \
    43544354    } while (0)
    … …  
    47254725
    47264726    if (LIKELY(argCount == newCodeBlock->numParameters)) {
    4727         VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(callFrame->registers() + registerOffset) }};
     4727        VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(callFrame->registers() + registerOffset) }, };
    47284728        return pair.i;
    47294729    }
    … …  
    47374737            argv[i + argCount] = argv[i];
    47384738
    4739         VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }};
     4739        VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }, };
    47404740        return pair.i;
    47414741    }
    … …  
    47534753        argv[i] = jsUndefined();
    47544754
    4755     VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }};
     4755    VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }, };
    47564756    return pair.i;
    47574757}
    … …  
    49754975
    49764976    if (LIKELY(argCount == newCodeBlock->numParameters)) {
    4977         VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(callFrame->registers() + registerOffset) }};
     4977        VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(callFrame->registers() + registerOffset) }, };
    49784978        return pair.i;
    49794979    }
    … …  
    49874987            argv[i + argCount] = argv[i];
    49884988
    4989         VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }};
     4989        VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }, };
    49904990        return pair.i;
    49914991    }
    … …  
    50035003        argv[i] = jsUndefined();
    50045004
    5005     VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }};
     5005    VoidPtrPairValue pair = {{ newCodeBlock, CallFrame::create(r) }, };
    50065006    return pair.i;
    50075007}
    … …  
    51045104            VM_CHECK_EXCEPTION_AT_END();
    51055105
    5106             VoidPtrPairValue pair = {{ thisObj, asPointer(result) }};
     5106            VoidPtrPairValue pair = {{ thisObj, asPointer(result) }, };
    51075107            return pair.i;
    51085108        }
    … …  
    53855385    VM_CHECK_EXCEPTION_AT_END();
    53865386
    5387     VoidPtrPairValue pair = {{ asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() + 1)) }};
     5387    VoidPtrPairValue pair = {{ asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() + 1)) }, };
    53885388    return pair.i;
    53895389}
    … …  
    55015501            VM_CHECK_EXCEPTION_AT_END();
    55025502
    5503             VoidPtrPairValue pair = {{ base, asPointer(result) }};
     5503            VoidPtrPairValue pair = {{ base, asPointer(result) }, };
    55045504            return pair.i;
    55055505        }
    … …  
    55715571    VM_CHECK_EXCEPTION_AT_END();
    55725572
    5573     VoidPtrPairValue pair = {{ asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() - 1)) }};
     5573    VoidPtrPairValue pair = {{ asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() - 1)) }, };
    55745574    return pair.i;
    55755575}
Note: See TracChangeset for help on using the changeset viewer.