Changeset c04bb79 in git


Ignore:
Timestamp:
2011-04-09T12:55:48Z (8 years ago)
Author:
Xuefer <xuefer@…>
Branches:
3.0, 3.1, 3.2, master, trunk
Children:
54fe3c7
Parents:
4299945
Message:

merge from trunk

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@724 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • processor/processor.m4

    re2a871e rc04bb79  
    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.