Changeset 211 for branches/1.0/utils.c


Ignore:
Timestamp:
2006-10-02T03:15:04+02:00 (8 years ago)
Author:
moo
Message:

trunk->b1.0 [209] [210]: conflict between sandbox and user error handler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.0/utils.c

    r19 r211  
    335335    sandbox->filename = filename; 
    336336 
     337#ifdef E_STRICT 
     338    sandbox->orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting); 
     339    EG(user_error_handler_error_reporting) &= ~E_STRICT; 
     340#endif 
     341 
    337342    return sandbox; 
    338343} 
     
    357362    /* install class */ 
    358363    while (b != NULL) { 
    359         xc_install_class(sandbox->filename, (xc_cest_t*)b->pData, 
     364        xc_install_class(sandbox->filename, (xc_cest_t*) b->pData, 
    360365                BUCKET_KEY_TYPE(b), BUCKET_KEY(b), b->nKeyLength TSRMLS_CC); 
    361366        b = b->pListNext; 
     
    397402    memcpy(&CG(open_files),     &OG(open_files),     sizeof(CG(open_files))); 
    398403 
     404#ifdef E_STRICT 
     405    EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting; 
     406#endif 
     407 
    399408    if (sandbox->alloc) { 
    400409        efree(sandbox); 
Note: See TracChangeset for help on using the changeset viewer.