Index: trunk/xcache.c
===================================================================
--- trunk/xcache.c	(revision 859)
+++ trunk/xcache.c	(revision 860)
@@ -1134,7 +1134,7 @@
 }
 /* }}} */
-static void xc_entry_init_key_php_entry(xc_entry_php_t *entry_php, ZEND_24(const) char *filepath TSRMLS_DC) /* {{{*/
-{
-	entry_php->filepath     = filepath;
+static void xc_entry_init_key_php_entry(xc_entry_php_t *entry_php, const char *filepath TSRMLS_DC) /* {{{*/
+{
+	entry_php->filepath     = ZEND_24((char *), NOTHING) filepath;
 	entry_php->filepath_len = strlen(entry_php->filepath);
 	entry_php->dirpath      = estrndup(entry_php->filepath, entry_php->filepath_len);
@@ -1696,5 +1696,5 @@
 
 	xc_undo_pass_two(compiler->new_php.op_array TSRMLS_CC);
-	xc_foreach_early_binding_class(compiler->new_php.op_array, xc_cache_early_binding_class_cb, (void *) compiler->new_php.SRMLS_CC);
+	xc_foreach_early_binding_class(compiler->new_php.op_array, xc_cache_early_binding_class_cb, (void *) &compiler->new_php TSRMLS_CC);
 	xc_redo_pass_two(compiler->new_php.op_array TSRMLS_CC);
 	/* }}} */
@@ -3145,12 +3145,11 @@
 PHP_FUNCTION(xcache_is_autoglobal)
 {
-	char *name;
-	int name_len;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
+	zval *name;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name) == FAILURE) {
 		return;
 	}
 
-	RETURN_BOOL(zend_hash_exists(CG(auto_globals), name, name_len + 1));
+	RETURN_BOOL(zend_u_hash_exists(CG(auto_globals), UG(unicode), Z_STRVAL_P(name), Z_STRLEN_P(name) + 1));
 }
 /* }}} */