Index: trunk/processor/head.m4
===================================================================
--- trunk/processor/head.m4	(revision 854)
+++ trunk/processor/head.m4	(revision 856)
@@ -416,5 +416,7 @@
 		zend_hash_destroy(&processor.strings);
 	}
-	src->ifelse(`$1', `xc_entry_php_t', entry.)size = processor.size;
+	src->ifelse(
+		`$1', `xc_entry_data_php_t', `',
+		`', `', entry.)size = processor.size;
 	ifelse(
 		`$1', `xc_entry_var_t', `src->have_references = processor.have_references;',
@@ -467,5 +469,5 @@
 /* }}} */
 ')
-DEFINE_STORE_API(`xc_entry_t')
+DEFINE_STORE_API(`xc_entry_var_t')
 DEFINE_STORE_API(`xc_entry_php_t')
 DEFINE_STORE_API(`xc_entry_data_php_t')
@@ -502,10 +504,10 @@
 }
 /* }}} */
-/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src TSRMLS_DC); :export {{{ */
-xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src TSRMLS_DC) {
+/* export: xc_entry_var_t *xc_processor_restore_xc_entry_var_t(xc_entry_var_t *dst, const xc_entry_var_t *src TSRMLS_DC); :export {{{ */
+xc_entry_var_t *xc_processor_restore_xc_entry_var_t(xc_entry_var_t *dst, const xc_entry_var_t *src TSRMLS_DC) {
 	xc_processor_t processor;
 
 	memset(&processor, 0, sizeof(processor));
-	xc_restore_xc_entry_t(&processor, dst, src TSRMLS_CC);
+	xc_restore_xc_entry_var_t(&processor, dst, src TSRMLS_CC);
 
 	return dst;
@@ -535,7 +537,7 @@
 #ifdef HAVE_XCACHE_DPRINT
 void xc_dprint(xc_entry_php_t *src, int indent TSRMLS_DC) {
-	IFDPRINT(`INDENT()`'fprintf(stderr, "xc_entry_t:src");')
-	xc_dprint_xc_entry_t(src, indent TSRMLS_CC);
-}
-#endif
-/* }}} */
+	IFDPRINT(`INDENT()`'fprintf(stderr, "xc_entry_php_t:src");')
+	xc_dprint_xc_entry_php_t(src, indent TSRMLS_CC);
+}
+#endif
+/* }}} */