Changeset 200 for trunk/xcache.h

Show
Ignore:
Timestamp:
09/29/2006 02:09:51 AM (6 years ago)
Author:
moo
Message:

BUCKET_KEY readability and PHP_6 build fix

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/xcache.h

    r191 r200  
    4848                : b->nKeyLength \ 
    4949                )) 
    50 #define BUCKET_KEY(b)  (UNISW((b)->arKey, (b)->key.arKey.s)) 
    51 #define BUCKET_UKEY(b) (UNISW((b)->arKey, (b)->key.arKey.u)) 
    52 #define BUCKET_KEY_TYPE(b) (UNISW(0, (b)->key.type)) 
     50#define BUCKET_KEY_S(b)    (UNISW((b)->arKey, (b)->key.arKey.s)) 
     51#define BUCKET_KEY_U(b)    (UNISW((b)->arKey, (b)->key.arKey.u)) 
     52#define BUCKET_KEY_TYPE(b) (UNISW(IS_STRING, (b)->key.type)) 
    5353#ifdef IS_UNICODE 
    5454#   define BUCKET_HEAD_SIZE(b) XtOffsetOf(Bucket, key.arKey) 
    … …  
    9595       zend_hash_find(ht, arKey, nKeyLength, pData) 
    9696 
     97#   define zend_u_hash_quick_find(ht, type, arKey, nKeyLength, h, pData) \ 
     98       zend_hash_quick_find(ht, arKey, nKeyLength, h, pData) 
     99 
    97100#   define add_u_assoc_zval_ex(arg, type, key, key_len, value) \ 
    98101        add_assoc_zval_ex(arg, key, key_len, value)