Changeset 556 for trunk


Ignore:
Timestamp:
2008-05-05T15:59:57+02:00 (6 years ago)
Author:
moo
Message:

PHP_6: upstream api changed, fix build

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.c

    r553 r556  
    834834 
    835835#define HASH(i) (i) 
    836 #define HASH_USTR_L(t, s, l) HASH(zend_u_inline_hash_func(t, s, (l + 1) * sizeof(UChar))) 
     836#define HASH_ZSTR_L(t, s, l) HASH(zend_u_inline_hash_func(t, s, (l + 1) * sizeof(UChar))) 
    837837#define HASH_STR_S(s, l) HASH(zend_inline_hash_func(s, l)) 
    838838#define HASH_STR_L(s, l) HASH_STR_S(s, l + 1) 
     
    851851static inline xc_hash_value_t xc_entry_hash_name(xc_entry_t *xce TSRMLS_DC) /* {{{ */ 
    852852{ 
    853     return UNISW(NOTHING, UG(unicode) ? HASH_USTR_L(xce->name_type, xce->name.uni.val, xce->name.uni.len) :) 
     853    return UNISW(NOTHING, UG(unicode) ? HASH_ZSTR_L(xce->name_type, xce->name.uni.val, xce->name.uni.len) :) 
    854854        HASH_STR_L(xce->name.str.val, xce->name.str.len); 
    855855} 
     
    870870#ifdef IS_UNICODE 
    871871    if (UG(unicode) && xce->name_type == IS_UNICODE) { 
    872         UChar *basename; 
     872        zstr basename; 
    873873        int basename_len; 
    874         php_u_basename(xce->name.uni.val, xce->name.uni.len, NULL_ZSTR, 0, &basename, &basename_len TSRMLS_CC); 
    875         return HASH_USTR_L(IS_UNICODE, basename, basename_len); 
     874        php_u_basename(xce->name.ustr.val, xce->name.ustr.len, NULL, 0, &basename.u, &basename_len TSRMLS_CC); 
     875        return HASH_ZSTR_L(IS_UNICODE, basename, basename_len); 
    876876    } 
    877877    else 
Note: See TracChangeset for help on using the changeset viewer.