Changeset 634 for branches/1.3/xcache.c


Ignore:
Timestamp:
2009-07-05T11:47:17+02:00 (5 years ago)
Author:
moo
Message:

fix bad merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/xcache.c

    r633 r634  
    895895} 
    896896/* }}} */ 
    897 static inline xc_hash_value_t xc_php_hash_md5(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */ 
    898 { 
    899     return HASH_STR_S(php->md5, sizeof(php->md5)); 
    900 } 
    901 /* }}} */ 
    902897#ifndef ZEND_COMPILE_DELAYED_BINDING 
    903898static void xc_cache_early_binding_class_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */ 
     
    999994            TRACE("found %s, catch it", stored_xce->name.str.val); 
    1000995            xc_entry_hold_php_dmz(stored_xce TSRMLS_CC); 
    1001             xc_cache_hit_dmz(cache); 
     996            xc_cache_hit_dmz(cache TSRMLS_CC); 
    1002997            break; 
    1003998        } 
Note: See TracChangeset for help on using the changeset viewer.