Changeset 48471ef in git for xcache.c


Ignore:
Timestamp:
2009-07-05T09:47:17Z (10 years ago)
Author:
Xuefer <xuefer@…>
Branches:
1.3
Children:
4689418
Parents:
46dfa7a
Message:

fix bad merge

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.3@634 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • xcache.c

    r46dfa7a r48471ef  
    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.