Changeset 1321 for trunk/xcache.c


Ignore:
Timestamp:
2013-07-15T19:37:57+02:00 (17 months ago)
Author:
moo
Message:

add back PHP_4 code for disassembler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.c

    r1313 r1321  
    115115/* }}} */ 
    116116/* {{{ PHP_GINIT_FUNCTION(xcache) */ 
    117 #define xcache_globals xcacheglobals 
     117#pragma GCC push_options 
     118#pragma GCC diagnostic ignored "-Wshadow" 
     119 
    118120#ifdef PHP_GINIT_FUNCTION 
    119121static PHP_GINIT_FUNCTION(xcache) 
    120122#else 
    121 static void xc_init_globals(zend_xcache_globals *xcache_globals TSRMLS_DC) 
    122 #endif 
    123 { 
     123static void xc_init_globals(zend_xcache_globals* xcache_globals TSRMLS_DC) 
     124#endif 
     125{ 
     126#pragma GCC pop_options 
     127 
    124128    memset(xcache_globals, 0, sizeof(zend_xcache_globals)); 
    125129 
     
    130134    zend_hash_init_ex(&xcache_globals->internal_class_table,    1, NULL, NULL, 1, 0); 
    131135} 
    132 #undef xcache_globals 
    133136/* }}} */ 
    134137/* {{{ PHP_GSHUTDOWN_FUNCTION(xcache) */ 
    135138static 
    136139#ifdef PHP_GSHUTDOWN_FUNCTION 
    137 #define xcache_globals xcacheglobals 
    138140PHP_GSHUTDOWN_FUNCTION(xcache) 
    139141#else 
     
    169171    } 
    170172} 
    171 #undef xcache_globals 
    172173/* }}} */ 
    173174 
     
    885886    PHP_GSHUTDOWN(xcache), 
    886887#endif 
     888#ifdef ZEND_ENGINE_2 
    887889    NULL /* ZEND_MODULE_POST_ZEND_DEACTIVATE_N */, 
     890#else 
     891    NULL, 
     892    NULL, 
     893#endif 
    888894    STANDARD_MODULE_PROPERTIES_EX 
    889895}; 
Note: See TracChangeset for help on using the changeset viewer.