Index: php_runkit.h
===================================================================
RCS file: /repository/pecl/runkit/php_runkit.h,v
retrieving revision 1.31
diff -u -p -r1.31 php_runkit.h
--- php_runkit.h	31 Mar 2008 10:11:36 -0000	1.31
+++ php_runkit.h	26 May 2008 23:22:21 -0000
@@ -173,7 +173,7 @@ int php_runkit_fetch_interface(char *cla
 #define PHP_RUNKIT_DECL_STRING_PARAM(p)			char *p; int p##_len;
 #define PHP_RUNKIT_STRING_SPEC					"s"
 #define PHP_RUNKIT_STRING_PARAM(p)				&p, &p##_len
-#define PHP_RUNKIT_STRTOLOWER(p)				php_strtolower(&p, &p##_len)
+#define PHP_RUNKIT_STRTOLOWER(p)				php_strtolower(p, p##_len)
 #define PHP_RUNKIT_STRING_LEN(param,addtl)		(param##_len + (addtl))
 #define PHP_RUNKIT_STRING_TYPE(param)			IS_STRING
 #define PHP_RUNKIT_HASH_FIND(hash,param,ppvar)	zend_hash_find(hash, param, param##_len + 1, (void**)ppvar)
Index: runkit_functions.c
===================================================================
RCS file: /repository/pecl/runkit/runkit_functions.c,v
retrieving revision 1.11
diff -u -p -r1.11 runkit_functions.c
--- runkit_functions.c	27 Dec 2007 21:16:05 -0000	1.11
+++ runkit_functions.c	26 May 2008 23:22:22 -0000
@@ -363,8 +363,8 @@ PHP_FUNCTION(runkit_function_rename)
 		RETURN_FALSE;
 	}
 
+	func = *fe;
 	if (fe->type == ZEND_USER_FUNCTION) {
-		func = *fe;
 		PHP_RUNKIT_FUNCTION_ADD_REF(&func);
 	}