Index: /trunk/processor/head.m4
===================================================================
--- /trunk/processor/head.m4	(revision 855)
+++ /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
+/* }}} */
Index: /trunk/processor/main.m4
===================================================================
--- /trunk/processor/main.m4	(revision 855)
+++ /trunk/processor/main.m4	(revision 856)
@@ -252,5 +252,5 @@
 EXPORT(`xc_classinfo_t')
 EXPORT(`xc_funcinfo_t')
-EXPORT(`xc_entry_t')
+EXPORT(`xc_entry_var_t')
 EXPORT(`xc_entry_php_t')
 EXPORT(`xc_entry_data_php_t')
Index: /trunk/processor/processor.m4
===================================================================
--- /trunk/processor/processor.m4	(revision 855)
+++ /trunk/processor/processor.m4	(revision 856)
@@ -10,5 +10,6 @@
 #endif
 DECL_STRUCT_P_FUNC(`zend_function')
-DECL_STRUCT_P_FUNC(`xc_entry_t')
+DECL_STRUCT_P_FUNC(`xc_entry_var_t')
+DECL_STRUCT_P_FUNC(`xc_entry_php_t')
 #ifdef ZEND_ENGINE_2
 DECL_STRUCT_P_FUNC(`zend_property_info')
Index: /trunk/xcache.c
===================================================================
--- /trunk/xcache.c	(revision 855)
+++ /trunk/xcache.c	(revision 856)
@@ -267,5 +267,5 @@
 	stored_xce = type == XC_TYPE_PHP
 		? (xc_entry_t *) xc_processor_store_xc_entry_php_t(cache, (xc_entry_php_t *) xce TSRMLS_CC)
-		: xc_processor_store_xc_entry_t(cache, xce TSRMLS_CC);
+		: (xc_entry_t *) xc_processor_store_xc_entry_var_t(cache, (xc_entry_var_t *) xce TSRMLS_CC);
 	if (stored_xce) {
 		xc_entry_add_dmz(cache, entryslotid, stored_xce);
@@ -281,4 +281,9 @@
 {
 	return (xc_entry_php_t *) xc_entry_store_dmz(XC_TYPE_PHP, cache, entryslotid, (xc_entry_t *) xce TSRMLS_CC);
+}
+/* }}} */
+static xc_entry_var_t *xc_entry_var_store_dmz(xc_cache_t *cache, xc_hash_value_t entryslotid, xc_entry_var_t *xce TSRMLS_DC) /* {{{ */
+{
+	return (xc_entry_var_t *) xc_entry_store_dmz(XC_TYPE_VAR, cache, entryslotid, (xc_entry_t *) xce TSRMLS_CC);
 }
 /* }}} */
@@ -2754,5 +2759,5 @@
 		}
 		xce.value = value;
-		RETVAL_BOOL(xc_entry_store_dmz(XC_TYPE_VAR, cache, entry_hash.entryslotid, (xc_entry_t *) &xce TSRMLS_CC) != NULL ? 1 : 0);
+		RETVAL_BOOL(xc_entry_var_store_dmz(cache, entry_hash.entryslotid, &xce TSRMLS_CC) != NULL ? 1 : 0);
 	} LEAVE_LOCK(cache);
 }
@@ -2944,5 +2949,5 @@
 			xc_entry_remove_dmz(XC_TYPE_VAR, cache, entry_hash.cacheslotid, (xc_entry_t *) stored_xce TSRMLS_CC);
 		}
-		xc_entry_store_dmz(XC_TYPE_VAR, cache, entry_hash.cacheslotid, (xc_entry_t *) &xce TSRMLS_CC);
+		xc_entry_var_store_dmz(cache, entry_hash.cacheslotid, &xce TSRMLS_CC);
 
 	} LEAVE_LOCK(cache);