Changeset 405 for trunk/utils.c


Ignore:
Timestamp:
2007-05-31T05:48:08+02:00 (7 years ago)
Author:
moo
Message:

full ZendOptimizer? compatibility

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/utils.c

    r393 r405  
    624624} 
    625625/* }}} */ 
    626 static void xc_sandbox_install(xc_sandbox_t *sandbox TSRMLS_DC) /* {{{ */ 
     626static void xc_sandbox_install(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC) /* {{{ */ 
    627627{ 
    628628    int i; 
     
    668668#endif 
    669669 
    670     xc_undo_pass_two(CG(active_op_array) TSRMLS_CC); 
    671     xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC); 
    672     xc_redo_pass_two(CG(active_op_array) TSRMLS_CC); 
     670    if (install != XC_InstallNoBinding) { 
     671        xc_undo_pass_two(CG(active_op_array) TSRMLS_CC); 
     672        xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC); 
     673        xc_redo_pass_two(CG(active_op_array) TSRMLS_CC); 
     674    } 
    673675 
    674676    i = 1; 
     
    676678} 
    677679/* }}} */ 
    678 void xc_sandbox_free(xc_sandbox_t *sandbox, int install TSRMLS_DC) /* {{{ */ 
     680void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC) /* {{{ */ 
    679681{ 
    680682    /* restore first first install function/class */ 
     
    689691#endif 
    690692 
    691     if (install) { 
     693    if (install != XC_NoInstall) { 
    692694        CG(in_compilation)    = 1; 
    693695        CG(compiled_filename) = sandbox->filename; 
    694696        CG(zend_lineno)       = 0; 
    695         xc_sandbox_install(sandbox TSRMLS_CC); 
     697        xc_sandbox_install(sandbox, install TSRMLS_CC); 
    696698        CG(in_compilation)    = 0; 
    697699        CG(compiled_filename) = NULL; 
Note: See TracChangeset for help on using the changeset viewer.