PHP_6: fix build

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@637 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

utils.c

@@ -596,9 +596,13 @@ static int xc_auto_global_arm(zend_auto_global *auto_global TSRMLS_DC) /* {{{ */
 /* }}} */
 #endif
 
-static void xc_copy_zend_constant(zend_constant *c) /* {{{ */
+void xc_copy_zend_constant(zend_constant *c) /* {{{ */
 {
+#ifdef IS_UNICODE
+	c->name.u = zend_ustrndup(c->name.u, c->name_len - 1);
+#else
 	c->name = zend_strndup(c->name, c->name_len - 1);
+#endif
 	if (!(c->flags & CONST_PERSISTENT)) {
 		zval_copy_ctor(&c->value);
 	}

utils.h

@@ -122,3 +122,4 @@ typedef enum _xc_install_action_t {
 void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce));
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC);
 void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC);
+void xc_copy_zend_constant(zend_constant *c);

xcache.c

@@ -1848,14 +1848,6 @@ err:
 	return 0;
 }
 /* }}} */
-static void xc_copy_zend_constant(zend_constant *c) /* {{{ */
-{
-	c->name = zend_strndup(c->name, c->name_len - 1);
-	if (!(c->flags & CONST_PERSISTENT)) {
-		zval_copy_ctor(&c->value);
-	}
-}
-/* }}} */
 static void xc_request_init(TSRMLS_D) /* {{{ */
 {
 	int i;
@@ -2216,7 +2208,7 @@ static int xc_entry_init_key_var(xc_entry_t *xce, zval *name TSRMLS_DC) /* {{{ *
 			break;
 		default:
 #ifdef IS_UNICODE
-			convert_to_text(name);
+			convert_to_unicode(name);
 #else
 			convert_to_string(name);
 #endif