Index: /trunk/processor/head.m4
===================================================================
--- /trunk/processor/head.m4	(revision 58)
+++ /trunk/processor/head.m4	(revision 90)
@@ -130,6 +130,6 @@
  * return class_index + 1
  */
-static zend_uint xc_get_class_num(processor_t *processor, zend_class_entry *ce) {
-	zend_uint i;
+static zend_ulong xc_get_class_num(processor_t *processor, zend_class_entry *ce) {
+	zend_ulong i;
 	const xc_entry_t *xce = processor->xce_src;
 	zend_class_entry *ceptr;
@@ -147,10 +147,10 @@
 	}
 	assert(0);
-	return (zend_uint) -1;
+	return (zend_ulong) -1;
 }
 /* }}} */
 /* {{{ xc_get_class */
 #ifdef ZEND_ENGINE_2
-static zend_class_entry *xc_get_class(processor_t *processor, zend_uint class_num) {
+static zend_class_entry *xc_get_class(processor_t *processor, zend_ulong class_num) {
 	/* must be parent or currrent class */
 	assert(class_num <= processor->active_class_num);
@@ -255,5 +255,4 @@
 			dst = NULL;
 			goto err_alloc;
-			return NULL;
 		}
 		IFASSERT(`oldp = processor.p;')
Index: /trunk/processor/main.m4
===================================================================
--- /trunk/processor/main.m4	(revision 12)
+++ /trunk/processor/main.m4	(revision 90)
@@ -92,5 +92,5 @@
 	if ($2) {
 		IFSTORE(`$1 = (zend_class_entry *) xc_get_class_num(processor, $2);')
-		IFRESTORE(`$1 = xc_get_class(processor, (zend_uint) $2);')
+		IFRESTORE(`$1 = xc_get_class(processor, (zend_ulong) $2);')
 		IFDASM(`add_assoc_stringl_ex(dst, ZEND_STRS("$3"), $2->name, strlen($2->name), 1);')
 	}
Index: /trunk/coverager.c
===================================================================
--- /trunk/coverager.c	(revision 51)
+++ /trunk/coverager.c	(revision 90)
@@ -206,5 +206,6 @@
 	zstr s;
 	char *outfilename;
-	int dumpdir_len, outfilelen, size, alloc_len = 0;
+	int dumpdir_len, outfilelen, alloc_len = 0;
+	uint size;
 
 	if (!XG(coverages)) {
Index: /trunk/xcache.c
===================================================================
--- /trunk/xcache.c	(revision 86)
+++ /trunk/xcache.c	(revision 90)
@@ -1960,5 +1960,5 @@
 }
 /* }}} */
-static int xc_config_long(long *p, char *name, char *default_value) /* {{{ */
+static int xc_config_long(zend_ulong *p, char *name, char *default_value) /* {{{ */
 {
 	char *value;