Changeset 659

Show
Ignore:
Timestamp:
08/02/2009 03:53:56 AM (4 years ago)
Author:
moo
Message:

PHP 6 fix

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/xcache.h

    r649 r659  
    104104                : b->nKeyLength \ 
    105105                )) 
    106 #define BUCKET_KEY_S(b)    (UNISW((b)->arKey, (b)->key.arKey.s)) 
    107 #define BUCKET_KEY_U(b)    (UNISW((b)->arKey, (b)->key.arKey.u)) 
     106#define BUCKET_KEY(b)      (UNISW((b)->arKey, (b)->key.arKey)) 
     107#define BUCKET_KEY_S(b)    ZSTR_S(BUCKET_KEY(b)) 
     108#define BUCKET_KEY_U(b)    ZSTR_U(BUCKET_KEY(b)) 
    108109#define BUCKET_KEY_TYPE(b) (UNISW(IS_STRING,  (b)->key.type)) 
    109110#ifdef IS_UNICODE