Index: trunk/processor/head.m4
===================================================================
--- trunk/processor/head.m4	(revision 148)
+++ trunk/processor/head.m4	(revision 178)
@@ -54,6 +54,6 @@
 #define MAX_DUP_STR_LEN 256
 dnl }}}
-/* export: typedef struct _processor_t processor_t; :export {{{ */
-struct _processor_t {
+/* export: typedef struct _xc_processor_t xc_processor_t; :export {{{ */
+struct _xc_processor_t {
 	char *p;
 	zend_uint size;
@@ -117,5 +117,5 @@
 /* {{{ xc_calc_string_n */
 REDEF(`KIND', `calc')
-static inline void xc_calc_string_n(processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) {
+static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) {
 	pushdef(`__LINE__', `relayline')
 	int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
@@ -139,5 +139,5 @@
 /* {{{ xc_store_string_n */
 REDEF(`KIND', `store')
-static inline zstr xc_store_string_n(processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) {
+static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) {
 	pushdef(`__LINE__', `relayline')
 	int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
@@ -166,5 +166,5 @@
  * return class_index + 1
  */
-static zend_ulong xc_get_class_num(processor_t *processor, zend_class_entry *ce) {
+static zend_ulong xc_get_class_num(xc_processor_t *processor, zend_class_entry *ce) {
 	zend_ulong i;
 	const xc_entry_t *xce = processor->xce_src;
@@ -188,5 +188,5 @@
 /* {{{ xc_get_class */
 #ifdef ZEND_ENGINE_2
-static zend_class_entry *xc_get_class(processor_t *processor, zend_ulong class_num) {
+static zend_class_entry *xc_get_class(xc_processor_t *processor, zend_ulong class_num) {
 	/* must be parent or currrent class */
 	assert(class_num <= processor->active_class_num);
@@ -197,5 +197,5 @@
 #ifdef ZEND_ENGINE_2
 /* fix method on store */
-static void xc_fix_method(processor_t *processor, zend_op_array *dst) /* {{{ */
+static void xc_fix_method(xc_processor_t *processor, zend_op_array *dst) /* {{{ */
 {
 	zend_function *zf = (zend_function *) dst;
@@ -251,5 +251,5 @@
 xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC) {
 	xc_entry_t *dst;
-	processor_t processor;
+	xc_processor_t processor;
 
 	memset(&processor, 0, sizeof(processor));
@@ -324,5 +324,5 @@
 /* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
 xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC) {
-	processor_t processor;
+	xc_processor_t processor;
 
 	memset(&processor, 0, sizeof(processor));
@@ -335,5 +335,5 @@
 /* export: zval *xc_processor_restore_zval(zval *dst, const zval *src TSRMLS_DC); :export {{{ */
 zval *xc_processor_restore_zval(zval *dst, const zval *src TSRMLS_DC) {
-	processor_t processor;
+	xc_processor_t processor;
 
 	memset(&processor, 0, sizeof(processor));