Changeset 637

Timestamp:

2009-07-05T12:05:40+02:00 (4 years ago)

Author:

moo

Message:

PHP_6: fix build

Location:

trunk

Files:

• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)
• xcache.c (modified) (2 diffs)

trunk/utils.c

@@ -597 +597 @@
 #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);

trunk/utils.h

@@ -123 +123 @@
 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);

trunk/xcache.c

@@ -1849 +1849 @@
 }
 /* }}} */
-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) /* {{{ */
 {
@@ -2217 +2209 @@
         default:
 #ifdef IS_UNICODE
-            convert_to_text(name);
+            convert_to_unicode(name);
 #else
             convert_to_string(name);