Changeset 633


Ignore:
Timestamp:
2009-07-05T11:44:56+02:00 (5 years ago)
Author:
moo
Message:

merged r486 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 486
  • branches/1.3/xcache.c

    r632 r633  
    617617    xc_entry_data_php_t *p = xce->data.php; 
    618618    zend_op_array *old_active_op_array = CG(active_op_array); 
     619#ifndef ZEND_ENGINE_2 
    619620    ALLOCA_FLAG(use_heap) 
    620  
    621 #ifndef ZEND_ENGINE_2 
    622621    /* new ptr which is stored inside CG(class_table) */ 
    623622    xc_cest_t **new_cest_ptrs = (xc_cest_t **)my_do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt, use_heap); 
Note: See TracChangeset for help on using the changeset viewer.