Index: /trunk/main/xc_shm_mmap.c
===================================================================
--- /trunk/main/xc_shm_mmap.c	(revision 982)
+++ /trunk/main/xc_shm_mmap.c	(revision 983)
@@ -246,5 +246,5 @@
 			shm->diff = PTR_SUB(shm->ptr_ro, (char *) shm->ptr);
 			/* no overlap */
-			assert(abs(shm->diff) >= size);
+			assert((xc_shmsize_t) abs(shm->diff) >= size);
 		}
 		else {
Index: /trunk/main/xc_utils.c
===================================================================
--- /trunk/main/xc_utils.c	(revision 982)
+++ /trunk/main/xc_utils.c	(revision 983)
@@ -137,5 +137,5 @@
 int xc_undo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
-	zend_op *opline, *end;
+	zend_op *opline, *opline_end;
 
 #ifdef ZEND_ENGINE_2_4
@@ -150,6 +150,6 @@
 
 	opline = op_array->opcodes;
-	end = opline + op_array->last;
-	while (opline < end) {
+	opline_end = opline + op_array->last;
+	while (opline < opline_end) {
 #ifdef ZEND_ENGINE_2_4
 		if (opline->op1_type == IS_CONST) {
@@ -198,5 +198,5 @@
 int xc_redo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
-	zend_op *opline, *end;
+	zend_op *opline, *opline_end;
 #ifdef ZEND_ENGINE_2_4
 	zend_literal *literal = op_array->literals;
@@ -219,6 +219,6 @@
 #ifdef ZEND_ENGINE_2_4
 	if (literal) {
-		zend_literal *end = literal + op_array->last_literal;
-		while (literal < end) {
+		zend_literal *literal_end = literal + op_array->last_literal;
+		while (literal < literal_end) {
 			Z_SET_ISREF(literal->constant);
 			Z_SET_REFCOUNT(literal->constant, 2); /* Make sure is_ref won't be reset */
@@ -229,6 +229,6 @@
 
 	opline = op_array->opcodes;
-	end = opline + op_array->last;
-	while (opline < end) {
+	opline_end = opline + op_array->last;
+	while (opline < opline_end) {
 #ifdef ZEND_ENGINE_2_4
 		if (opline->op1_type == IS_CONST) {
@@ -349,9 +349,9 @@
 int xc_foreach_early_binding_class(zend_op_array *op_array, void (*callback)(zend_op *opline, int oplineno, void *data TSRMLS_DC), void *data TSRMLS_DC) /* {{{ */
 {
-	zend_op *opline, *begin, *end, *next = NULL;
+	zend_op *opline, *begin, *opline_end, *next = NULL;
 
 	opline = begin = op_array->opcodes;
-	end = opline + op_array->last;
-	while (opline < end) {
+	opline_end = opline + op_array->last;
+	while (opline < opline_end) {
 		switch (opline->opcode) {
 #ifdef ZEND_GOTO
@@ -377,5 +377,5 @@
 
 			case ZEND_RETURN:
-				opline = end;
+				opline = opline_end;
 				break;
 
Index: /trunk/processor/head.m4
===================================================================
--- /trunk/processor/head.m4	(revision 982)
+++ /trunk/processor/head.m4	(revision 983)
@@ -368,5 +368,4 @@
 		for (b = done_names->pListHead; b != NULL; b = b->pListNext) {
 			int known = 0;
-			int i;
 			for (i = 0; i < assert_names_count; ++i) {
 				if (strcmp(assert_names[i], BUCKET_KEY_S(b)) == 0) {
Index: /trunk/xcache.c
===================================================================
--- /trunk/xcache.c	(revision 982)
+++ /trunk/xcache.c	(revision 983)
@@ -583,5 +583,5 @@
 {
 	zval *blocks, *hits;
-	int i;
+	size_t i;
 	const xc_block_t *b;
 #ifndef NDEBUG
@@ -848,6 +848,6 @@
 					entry_php = (xc_entry_php_t *) xc_stack_pop(s);
 					TRACE("unhold %d:%s", entry_php->file_inode, entry_php->entry.name.str.val);
+					assert(entry_php->refcount > 0);
 					--entry_php->refcount;
-					assert(entry_php->refcount >= 0);
 				}
 			} LEAVE_LOCK(cache);
@@ -1191,5 +1191,5 @@
 		compiler->entry_hash.entryslotid = xc_hash_fold(
 				compiler->new_entry.file_inode
-				? HASH(compiler->new_entry.file_device + compiler->new_entry.file_inode)
+				? (xc_hash_value_t) HASH(compiler->new_entry.file_device + compiler->new_entry.file_inode)
 				: basename_hash_value
 				, &xc_php_hentry);
@@ -1417,10 +1417,10 @@
 {
 #ifdef ZEND_ENGINE_2_4
-	zend_uint linteralindex;
-
-	for (linteralindex = 0; linteralindex < op_array_info->literalinfo_cnt; ++linteralindex) {
-		int index = op_array_info->literalinfos[linteralindex].index;
-		int literalinfo = op_array_info->literalinfos[linteralindex].info;
-		zend_literal *literal = &op_array->literals[index];
+	zend_uint literalinfoindex;
+
+	for (literalinfoindex = 0; literalinfoindex < op_array_info->literalinfo_cnt; ++literalinfoindex) {
+		int literalindex = op_array_info->literalinfos[literalinfoindex].index;
+		int literalinfo = op_array_info->literalinfos[literalinfoindex].info;
+		zend_literal *literal = &op_array->literals[literalindex];
 		if ((literalinfo & xcache_literal_is_file)) {
 			if (!shallow_copy) {
@@ -1466,7 +1466,7 @@
 
 	for (oplinenum = 0; oplinenum < op_array_info->oplineinfo_cnt; ++oplinenum) {
-		int oplineno = op_array_info->oplineinfos[oplinenum].index;
+		int oplineindex = op_array_info->oplineinfos[oplinenum].index;
 		int oplineinfo = op_array_info->oplineinfos[oplinenum].info;
-		zend_op *opline = &op_array->opcodes[oplineno];
+		zend_op *opline = &op_array->opcodes[oplineindex];
 		if ((oplineinfo & xcache_op1_is_file)) {
 			assert(Z_OP_TYPE(opline->op1) == IS_CONST);
@@ -3412,5 +3412,9 @@
 	PHP_FE(xcache_dprint,            NULL)
 #endif
+#ifdef PHP_FE_END
+	PHP_FE_END
+#else
 	{NULL, NULL,                     NULL}
+#endif
 };
 /* }}} */
@@ -4028,5 +4032,9 @@
 	ZEND_MOD_CONFLICTS("eAccelerator")
 	ZEND_MOD_CONFLICTS("Turck MMCache")
-	{NULL, NULL, NULL}
+#ifdef ZEND_MOD_END
+	ZEND_MOD_END
+#else
+	{NULL, NULL, NULL, 0}
+#endif
 };
 #endif