Changeset 724


Ignore:
Timestamp:
2011-04-09T14:55:48+02:00 (4 years ago)
Author:
moo
Message:

merge from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r721 r724  
    823823    DISPATCH(zend_bool, created_by_eval) 
    824824#endif 
     825#ifdef ZEND_ENGINE_2_4 
     826    DISPATCH(int, last_literal) 
     827    IFRESTORE(`COPY(literals)', `STRUCT_ARRAY(last_literal, zend_literal, literals)') 
     828 
     829    COPYNULL(run_time_cache) 
     830    COPYNULL(last_cache_slot) 
     831#endif 
    825832    } while (0); 
    826833    IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);') 
     
    856863            ') 
    857864    ') 
    858 #ifdef ZEND_ENGINE_2_4 
    859     DISPATCH(int, last_literal) 
    860     IFRESTORE(`COPY(literals)', `STRUCT_ARRAY(last_literal, zend_literal, literals)') 
    861  
    862     COPYNULL(run_time_cache) 
    863     COPYNULL(last_cache_slot) 
    864 #endif 
    865865 
    866866#endif 
Note: See TracChangeset for help on using the changeset viewer.