From 0af97244f2f944edcbae93c225aaef2695533782 Mon Sep 17 00:00:00 2001 From: Xuefer Date: Sun, 2 Aug 2009 01:53:56 +0000 Subject: [PATCH] PHP 6 fix git-svn-id: svn://svn.lighttpd.net/xcache/trunk@659 c26eb9a1-5813-0410-bd6c-c2e55f420ca7 --- xcache.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xcache.h b/xcache.h index 44e5653..4f17678 100644 --- a/xcache.h +++ b/xcache.h @@ -103,8 +103,9 @@ static inline void my_add_assoc_null_ex(zval *arg, char *key, uint key_len) ? UBYTES(b->nKeyLength) \ : b->nKeyLength \ )) -#define BUCKET_KEY_S(b) (UNISW((b)->arKey, (b)->key.arKey.s)) -#define BUCKET_KEY_U(b) (UNISW((b)->arKey, (b)->key.arKey.u)) +#define BUCKET_KEY(b) (UNISW((b)->arKey, (b)->key.arKey)) +#define BUCKET_KEY_S(b) ZSTR_S(BUCKET_KEY(b)) +#define BUCKET_KEY_U(b) ZSTR_U(BUCKET_KEY(b)) #define BUCKET_KEY_TYPE(b) (UNISW(IS_STRING, (b)->key.type)) #ifdef IS_UNICODE # define BUCKET_HEAD_SIZE(b) XtOffsetOf(Bucket, key.arKey)