Changeset 408 for branches/1.2/utils.c


Ignore:
Timestamp:
2007-05-31T06:20:14+02:00 (8 years ago)
Author:
moo
Message:

merged [405] [407] from trunk: fixed #92, full ZendOptimizer? compatibility

Location:
branches/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2

  • branches/1.2/utils.c

    r394 r408  
    630630} 
    631631/* }}} */ 
    632 static void xc_sandbox_install(xc_sandbox_t *sandbox TSRMLS_DC) /* {{{ */ 
     632static void xc_sandbox_install(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC) /* {{{ */ 
    633633{ 
    634634    int i; 
     
    674674#endif 
    675675 
    676     xc_undo_pass_two(CG(active_op_array) TSRMLS_CC); 
    677     xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC); 
    678     xc_redo_pass_two(CG(active_op_array) TSRMLS_CC); 
     676    if (install != XC_InstallNoBinding) { 
     677        xc_undo_pass_two(CG(active_op_array) TSRMLS_CC); 
     678        xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC); 
     679        xc_redo_pass_two(CG(active_op_array) TSRMLS_CC); 
     680    } 
    679681 
    680682    i = 1; 
     
    682684} 
    683685/* }}} */ 
    684 void xc_sandbox_free(xc_sandbox_t *sandbox, int install TSRMLS_DC) /* {{{ */ 
     686void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC) /* {{{ */ 
    685687{ 
    686688    /* restore first first install function/class */ 
     
    695697#endif 
    696698 
    697     if (install) { 
     699    if (install != XC_NoInstall) { 
    698700        CG(in_compilation)    = 1; 
    699701        CG(compiled_filename) = sandbox->filename; 
    700702        CG(zend_lineno)       = 0; 
    701         xc_sandbox_install(sandbox TSRMLS_CC); 
     703        xc_sandbox_install(sandbox, install TSRMLS_CC); 
    702704        CG(in_compilation)    = 0; 
    703705        CG(compiled_filename) = NULL; 
Note: See TracChangeset for help on using the changeset viewer.