Index: /branches/1.2/coverager.c
===================================================================
--- /branches/1.2/coverager.c	(revision 405)
+++ /branches/1.2/coverager.c	(revision 406)
@@ -17,5 +17,5 @@
 
 static char *xc_coveragedump_dir = NULL;
-static zend_compile_file_t *origin_compile_file;
+static zend_compile_file_t *old_compile_file = NULL;
 
 #if 0
@@ -454,5 +454,5 @@
 	zend_op_array *op_array;
 
-	op_array = origin_compile_file(h, type TSRMLS_CC);
+	op_array = old_compile_file(h, type TSRMLS_CC);
 	if (op_array) {
 		if (XG(coverager)) {
@@ -483,5 +483,5 @@
 int xc_coverager_init(int module_number TSRMLS_DC) /* {{{ */
 {
-	origin_compile_file = zend_compile_file;
+	old_compile_file = zend_compile_file;
 	zend_compile_file = xc_compile_file_for_coverage;
 
@@ -503,6 +503,6 @@
 void xc_coverager_destroy() /* {{{ */
 {
-	if (origin_compile_file == xc_compile_file_for_coverage) {
-		zend_compile_file = origin_compile_file;
+	if (old_compile_file == xc_compile_file_for_coverage) {
+		zend_compile_file = old_compile_file;
 	}
 	if (xc_coveragedump_dir) {
Index: /branches/1.2/xcache.c
===================================================================
--- /branches/1.2/xcache.c	(revision 405)
+++ /branches/1.2/xcache.c	(revision 406)
@@ -98,6 +98,6 @@
 
 static zend_bool xc_initized = 0;
-static zend_compile_file_t *origin_compile_file;
-static zend_llist_element  *xc_llist_zend_extension;
+static zend_compile_file_t *old_compile_file = NULL;
+static zend_llist_element  *xc_llist_zend_extension = NULL;
 
 static zend_bool xc_test = 0;
@@ -857,5 +857,5 @@
 
 	if (!XG(cacher)) {
-		op_array = origin_compile_file(h, type TSRMLS_CC);
+		op_array = old_compile_file(h, type TSRMLS_CC);
 #ifdef HAVE_XCACHE_OPTIMIZER
 		if (XG(optimizer)) {
@@ -876,5 +876,5 @@
 	xce.data.php = &php;
 	if (!xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC)) {
-		return origin_compile_file(h, type TSRMLS_CC);
+		return old_compile_file(h, type TSRMLS_CC);
 	}
 	cache = xce.cache;
@@ -884,5 +884,5 @@
 	if (cache->compiling) {
 		cache->clogs ++; /* is it safe here? */
-		return origin_compile_file(h, type TSRMLS_CC);
+		return old_compile_file(h, type TSRMLS_CC);
 	}
 
@@ -925,5 +925,5 @@
 	/* clogged */
 	if (clogged) {
-		return origin_compile_file(h, type TSRMLS_CC);
+		return old_compile_file(h, type TSRMLS_CC);
 	}
 	/* }}} */
@@ -942,5 +942,5 @@
 
 	zend_try {
-		op_array = origin_compile_file(h, type TSRMLS_CC);
+		op_array = old_compile_file(h, type TSRMLS_CC);
 	} zend_catch {
 		catched = 1;
@@ -1375,7 +1375,7 @@
 	xc_shm_t *shm = NULL;
 
-	if (origin_compile_file) {
-		zend_compile_file = origin_compile_file;
-		origin_compile_file = NULL;
+	if (old_compile_file) {
+		zend_compile_file = old_compile_file;
+		old_compile_file = NULL;
 	}
 
@@ -1419,5 +1419,5 @@
 
 		if (xc_php_size) {
-			origin_compile_file = zend_compile_file;
+			old_compile_file = zend_compile_file;
 			zend_compile_file = xc_compile_file;
 
@@ -2746,5 +2746,5 @@
 #endif
 /* }}} */
-static startup_func_t xc_last_ext_startup;
+static startup_func_t xc_last_ext_startup = NULL;
 static int xc_zend_startup_last(zend_extension *extension) /* {{{ */
 {