Changeset 213

Show
Ignore:
Timestamp:
06/06/06 13:01:05 (2 years ago)
Author:
hans
Message:

* Fix for ticket #101 ('bailout' is used in zend_globals.h in a ZTS build)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • eaccelerator/trunk/ChangeLog

    r212 r213  
     12006-06-06  Hans Rakers <hans at parse dot nl> 
     2        * Fix for ticket #101 ('bailout' is used in zend_globals.h in a ZTS 
     3          build) as suggested by <ihanick at gmail dot com> 
     4 
    152006-06-02  Hans Rakers <hans at parse dot nl> 
    26        * Removed two unused vars from the internal datastructures 
  • eaccelerator/trunk/eaccelerator.c

    r210 r213  
    13421342    zend_function tmp_func; 
    13431343    zend_class_entry tmp_class; 
    1344     int bailout; 
     1344    int ea_bailout; 
    13451345 
    13461346    DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] compile_file: marking\n", getpid())); 
     
    13821382    } 
    13831383 
    1384     bailout = 0; 
     1384    ea_bailout = 0; 
    13851385    zend_try { 
    13861386      t = mm_saved_zend_compile_file(file_handle, type TSRMLS_CC); 
     
    13911391      EG(class_table) = orig_eg_class_table; 
    13921392#endif 
    1393       bailout = 1; 
     1393      ea_bailout = 1; 
    13941394    } zend_end_try(); 
    1395     if (bailout) { 
     1395    if (ea_bailout) { 
    13961396      zend_bailout(); 
    13971397    } 
     
    14351435            CG(function_table)  = orig_function_table; 
    14361436            CG(class_table)             = orig_class_table; 
    1437             bailout                           = 1; 
     1437            ea_bailout                                = 1; 
    14381438        } zend_end_try(); 
    1439         if (bailout) { 
     1439        if (ea_bailout) { 
    14401440          zend_bailout (); 
    14411441        }