Changeset 408 for branches/1.2/utils.h

Show
Ignore:
Timestamp:
05/31/2007 04:20:14 AM (18 months ago)
Author:
moo
Message:

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

Location:
branches/1.2
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,400,402-404 to /trunk:1-302,344-346,371,374-375,388,391,393,395,400,402-405,407

  • branches/1.2/utils.h

    r394 r408  
    5757} xc_sandbox_t; 
    5858 
     59typedef enum _xc_install_action_t { 
     60    XC_NoInstall, 
     61    XC_Install, 
     62    XC_InstallNoBinding 
     63} xc_install_action_t; 
     64 
    5965void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce)); 
    6066xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC); 
    61 void xc_sandbox_free(xc_sandbox_t *sandbox, int install TSRMLS_DC); 
     67void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC);