Ignore:
Timestamp:
2009-07-05T10:18:06+02:00 (6 years ago)
Author:
Xuefer
Message:

merged r504:513 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/processor/processor.m4

    r621 r622  
    5757DEF_STRUCT_P_FUNC(`zend_brk_cont_element', , `
    5858#ifdef ZEND_ENGINE_2_2
    59 #ifndef IS_UNICODE
    6059    DISPATCH(int, start)
    61 #endif
    6260#endif
    6361    DISPATCH(int, cont)
     
    243241    pushdef(`emalloc', `malloc($1)')
    244242    pushdef(`ecalloc', `calloc($1, $2)')
    245     PROC_ZSTRING_L(, name, name_len)
     243    PROC_ZSTRING_N(, name, name_len)
    246244    popdef(`ecalloc')
    247245    popdef(`emalloc')
     
    283281#endif
    284282    dnl isnt in php6 yet
    285 #if defined(ZEND_ENGINE_2_2) && !defined(IS_UNICODE)
     283#if defined(ZEND_ENGINE_2_2)
    286284    PROC_CLASS_ENTRY_P(ce)
    287285#endif
     
    511509        /* deep */
    512510        STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
     511#ifdef ZEND_ENGINE_2
    513512        STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info)
    514513        xc_gc_add_op_array(dst TSRMLS_CC);
     514#endif
    515515        define(`SKIPASSERT_ONCE')
    516516    }
     
    646646                 && zend_u_hash_find(&(processor->active_class_entry_dst->parent->function_table),
    647647                        UG(unicode) ? IS_UNICODE : IS_STRING,
    648                         src->function_name, xc_zstrlen(UG(unicode), src->function_name) + 1,
     648                        src->function_name, xc_zstrlen(UG(unicode) ? IS_UNICODE : IS_STRING, src->function_name) + 1,
    649649                        (void **) &parent) == SUCCESS) {
    650650                    /* see do_inherit_method_check() */
     
    670670#endif
    671671
    672     IFRESTORE(`
    673 #ifdef ZEND_ENGINE_2
     672#ifdef ZEND_ENGINE_2
     673    PROC_CLASS_ENTRY_P(scope)
     674    IFCOPY(`
    674675        if (src->scope) {
    675             dst->scope = xc_get_class(processor, (zend_ulong) src->scope);
    676             xc_fix_method(processor, dst);
    677         }
    678         DONE(scope)
    679 #endif
    680     ', `
    681 #ifdef ZEND_ENGINE_2
    682         PROC_CLASS_ENTRY_P(scope)
    683 #endif
    684     ')
     676            xc_fix_method(processor, dst TSRMLS_CC);
     677        }
     678    ')
     679#endif
    685680
    686681    IFRESTORE(`
     
    701696        PROC_ZSTRING_N(type, key, key_size)
    702697    ')
     698    DISPATCH(ulong, h)
    703699    STRUCT(zend_constant, constant)
    704700')
     
    713709        PROC_ZSTRING_N(type, key, key_size)
    714710    ')
     711    DISPATCH(ulong, h)
    715712    STRUCT(zend_function, func)
    716713')
     
    724721        PROC_ZSTRING_N(type, key, key_size)
    725722    ')
     723    DISPATCH(ulong, h)
    726724#ifdef ZEND_ENGINE_2
    727725    STRUCT_P(zend_class_entry, cest)
     
    741739        PROC_ZSTRING_L(type, key, key_len)
    742740    ')
     741    DISPATCH(ulong, h)
    743742')
    744743dnl }}}
Note: See TracChangeset for help on using the changeset viewer.