Changeset 634 for branches/1.3/xcache.c

Timestamp:

07/05/2009 11:47:17 AM (4 years ago)

Author:

moo

Message:

fix bad merge

Files:

• branches/1.3/xcache.c (modified) (2 diffs)

branches/1.3/xcache.c

@@ -895 +895 @@
 }
 /* }}} */
-static inline xc_hash_value_t xc_php_hash_md5(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */
-{
-    return HASH_STR_S(php->md5, sizeof(php->md5));
-}
-/* }}} */
 #ifndef ZEND_COMPILE_DELAYED_BINDING
 static void xc_cache_early_binding_class_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */
@@ -999 +994 @@
             TRACE("found %s, catch it", stored_xce->name.str.val);
             xc_entry_hold_php_dmz(stored_xce TSRMLS_CC);
-            xc_cache_hit_dmz(cache);
+            xc_cache_hit_dmz(cache TSRMLS_CC);
             break;
         }