Changeset 637


Ignore:
Timestamp:
2009-07-05T12:05:40+02:00 (5 years ago)
Author:
moo
Message:

PHP_6: fix build

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/utils.c

    r635 r637  
    597597#endif 
    598598 
    599 static void xc_copy_zend_constant(zend_constant *c) /* {{{ */ 
    600 { 
     599void xc_copy_zend_constant(zend_constant *c) /* {{{ */ 
     600{ 
     601#ifdef IS_UNICODE 
     602    c->name.u = zend_ustrndup(c->name.u, c->name_len - 1); 
     603#else 
    601604    c->name = zend_strndup(c->name, c->name_len - 1); 
     605#endif 
    602606    if (!(c->flags & CONST_PERSISTENT)) { 
    603607        zval_copy_ctor(&c->value); 
  • trunk/utils.h

    r588 r637  
    123123xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC); 
    124124void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC); 
     125void xc_copy_zend_constant(zend_constant *c); 
  • trunk/xcache.c

    r631 r637  
    18491849} 
    18501850/* }}} */ 
    1851 static void xc_copy_zend_constant(zend_constant *c) /* {{{ */ 
    1852 { 
    1853     c->name = zend_strndup(c->name, c->name_len - 1); 
    1854     if (!(c->flags & CONST_PERSISTENT)) { 
    1855         zval_copy_ctor(&c->value); 
    1856     } 
    1857 } 
    1858 /* }}} */ 
    18591851static void xc_request_init(TSRMLS_D) /* {{{ */ 
    18601852{ 
     
    22172209        default: 
    22182210#ifdef IS_UNICODE 
    2219             convert_to_text(name); 
     2211            convert_to_unicode(name); 
    22202212#else 
    22212213            convert_to_string(name); 
Note: See TracChangeset for help on using the changeset viewer.