Changeset 636 for branches/1.3


Ignore:
Timestamp:
2009-07-05T11:52:57+02:00 (4 years ago)
Author:
moo
Message:

merged r635 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 635

  • branches/1.3/utils.c

    r634 r636  
    348348} 
    349349/* }}} */ 
     350#ifndef ZEND_COMPILE_DELAYED_BINDING 
    350351static int xc_do_early_binding(zend_op_array *op_array, HashTable *class_table, int oplineno TSRMLS_DC) /* {{{ */ 
    351352{ 
    … …  
    432433} 
    433434/* }}} */ 
     435#endif 
    434436 
    435437#ifdef HAVE_XCACHE_CONSTANT 
    … …  
    646648#endif 
    647649 
    648     XG(sandbox) = (void *) sandbox; 
    649650    return sandbox; 
    650651} 
    651652/* }}} */ 
     653#ifndef ZEND_COMPILE_DELAYED_BINDING 
    652654static void xc_early_binding_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */ 
    653655{ 
    … …  
    656658} 
    657659/* }}} */ 
     660#endif 
    658661static void xc_sandbox_install(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC) /* {{{ */ 
    659662{ 
Note: See TracChangeset for help on using the changeset viewer.